Merge remote-tracking branch 'spi/fix/hspi' into spi-linus

78e9fa52 · Mark Brown · 5acb8bb4 · 268d7643 · 78e9fa52
Commit 78e9fa52 authored Oct 07, 2013 by Mark Brown
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

drivers/spi/spi-sh-hspi.c drivers/spi/spi-sh-hspi.c +2 -2

No files found.
--- a/drivers/spi/spi-sh-hspi.c
+++ b/drivers/spi/spi-sh-hspi.c
@@ -296,6 +296,8 @@ static int hspi_probe(struct platform_device *pdev)
 		goto error1;
 	}

+	pm_runtime_enable(&pdev->dev);
+
 	master->num_chipselect	= 1;
 	master->bus_num		= pdev->id;
 	master->setup		= hspi_setup;
@@ -309,8 +311,6 @@ static int hspi_probe(struct platform_device *pdev)
 		goto error1;
 	}

-	pm_runtime_enable(&pdev->dev);
-
 	return 0;

 error1: