فهرست منبع

spi/s3c64xx: Ensure runtime PM is enabled prior to registration

Otherwise we may try to start transfers immediately and then fail to
runtime resume the device causing us not to have clocks enabled.

Signed-off-by: Mark Brown <broonie@linaro.org>
Reviewed-by: Sylwester Nawrocki <s.nawrocki@samsung.com>

Conflicts:
	drivers/spi/spi-s3c64xx.c
Mark Brown 12 سال پیش
والد
کامیت
3e2bd64d24
1فایلهای تغییر یافته به همراه2 افزوده شده و 2 حذف شده
  1. 2 2
      drivers/spi/spi-s3c64xx.c

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

@@ -1428,6 +1428,8 @@ static int s3c64xx_spi_probe(struct platform_device *pdev)
 	       S3C64XX_SPI_INT_TX_OVERRUN_EN | S3C64XX_SPI_INT_TX_UNDERRUN_EN,
 	       S3C64XX_SPI_INT_TX_OVERRUN_EN | S3C64XX_SPI_INT_TX_UNDERRUN_EN,
 	       sdd->regs + S3C64XX_SPI_INT_EN);
 	       sdd->regs + S3C64XX_SPI_INT_EN);
 
 
+	pm_runtime_enable(&pdev->dev);
+
 	if (spi_register_master(master)) {
 	if (spi_register_master(master)) {
 		dev_err(&pdev->dev, "cannot register SPI master\n");
 		dev_err(&pdev->dev, "cannot register SPI master\n");
 		ret = -EBUSY;
 		ret = -EBUSY;
@@ -1440,8 +1442,6 @@ static int s3c64xx_spi_probe(struct platform_device *pdev)
 					mem_res,
 					mem_res,
 					sdd->rx_dma.dmach, sdd->tx_dma.dmach);
 					sdd->rx_dma.dmach, sdd->tx_dma.dmach);
 
 
-	pm_runtime_enable(&pdev->dev);
-
 	return 0;
 	return 0;
 
 
 err3:
 err3: