Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3e2bd64d authored by Mark Brown's avatar Mark Brown
Browse files

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: default avatarMark Brown <broonie@linaro.org>
Reviewed-by: default avatarSylwester Nawrocki <s.nawrocki@samsung.com>

Conflicts:
	drivers/spi/spi-s3c64xx.c
parent 4a10c2ac

drivers/spi/spi-s3c64xx.c

+2 −2
Original line number Diff line number Diff line
@@ -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,

	       sdd->regs + S3C64XX_SPI_INT_EN);



	pm_runtime_enable(&pdev->dev);



	if (spi_register_master(master)) {

		dev_err(&pdev->dev, "cannot register SPI master\n");

		ret = -EBUSY;
@@ -1440,8 +1442,6 @@ static int s3c64xx_spi_probe(struct platform_device *pdev) 
					mem_res,

					sdd->rx_dma.dmach, sdd->tx_dma.dmach);



	pm_runtime_enable(&pdev->dev);



	return 0;



err3: