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

c55b869a · Mark Brown · 4c4b8da1 · 7b8f7eef · c55b869a
Commit c55b869a authored Oct 25, 2013 by Mark Brown
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

drivers/spi/spi-s3c64xx.c drivers/spi/spi-s3c64xx.c +2 -0

No files found.
--- a/drivers/spi/spi-s3c64xx.c
+++ b/drivers/spi/spi-s3c64xx.c
@@ -1121,6 +1121,7 @@ static int s3c64xx_spi_setup(struct spi_device *spi)
 	return 0;
 setup_exit:
+	pm_runtime_put(&sdd->pdev->dev);
 	/* setup() returns with device de-selected */
 	disable_cs(sdd, spi);
@@ -1428,6 +1429,7 @@ static int s3c64xx_spi_probe(struct platform_device *pdev)
 	       S3C64XX_SPI_INT_TX_OVERRUN_EN | S3C64XX_SPI_INT_TX_UNDERRUN_EN,
 	       sdd->regs + S3C64XX_SPI_INT_EN);
+	pm_runtime_set_active(&pdev->dev);
 	pm_runtime_enable(&pdev->dev);
 	if (spi_register_master(master)) {