Browse Source

spi: spi-coldfire-qspi: enable RuntimePM before registering to the core

The core may register clients attached to this master which may use
funtionality from the master. So, RuntimePM must be enabled before, otherwise
this will fail.

Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Wolfram Sang 9 years ago
parent
commit
f9b841af4c
1 changed files with 2 additions and 1 deletions
  1. 2 1
      drivers/spi/spi-coldfire-qspi.c

+ 2 - 1
drivers/spi/spi-coldfire-qspi.c

@@ -420,19 +420,20 @@ static int mcfqspi_probe(struct platform_device *pdev)
 	master->auto_runtime_pm = true;
 	master->auto_runtime_pm = true;
 
 
 	platform_set_drvdata(pdev, master);
 	platform_set_drvdata(pdev, master);
+	pm_runtime_enable(&pdev->dev);
 
 
 	status = devm_spi_register_master(&pdev->dev, master);
 	status = devm_spi_register_master(&pdev->dev, master);
 	if (status) {
 	if (status) {
 		dev_dbg(&pdev->dev, "spi_register_master failed\n");
 		dev_dbg(&pdev->dev, "spi_register_master failed\n");
 		goto fail2;
 		goto fail2;
 	}
 	}
-	pm_runtime_enable(&pdev->dev);
 
 
 	dev_info(&pdev->dev, "Coldfire QSPI bus driver\n");
 	dev_info(&pdev->dev, "Coldfire QSPI bus driver\n");
 
 
 	return 0;
 	return 0;
 
 
 fail2:
 fail2:
+	pm_runtime_disable(&pdev->dev);
 	mcfqspi_cs_teardown(mcfqspi);
 	mcfqspi_cs_teardown(mcfqspi);
 fail1:
 fail1:
 	clk_disable(mcfqspi->clk);
 	clk_disable(mcfqspi->clk);