diff options
| author | Wolfram Sang <wsa+renesas@sang-engineering.com> | 2015-10-09 10:39:27 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-10-12 17:02:08 +0100 |
| commit | f9b841af4c1c3c3b7ce3552ab5ee5d9c430e9c29 (patch) | |
| tree | 5d845f4b6faad3c9587e71d15d05ae0fffdbdbaa | |
| parent | 6ff33f3902c3b1c5d0db6b1e2c70b6d76fba357f (diff) | |
| download | lwn-f9b841af4c1c3c3b7ce3552ab5ee5d9c430e9c29.tar.gz lwn-f9b841af4c1c3c3b7ce3552ab5ee5d9c430e9c29.zip | |
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>
| -rw-r--r-- | drivers/spi/spi-coldfire-qspi.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/spi/spi-coldfire-qspi.c b/drivers/spi/spi-coldfire-qspi.c index 688956ff5095..23f6fffd75e1 100644 --- a/drivers/spi/spi-coldfire-qspi.c +++ b/drivers/spi/spi-coldfire-qspi.c @@ -420,19 +420,20 @@ static int mcfqspi_probe(struct platform_device *pdev) master->auto_runtime_pm = true; platform_set_drvdata(pdev, master); + pm_runtime_enable(&pdev->dev); status = devm_spi_register_master(&pdev->dev, master); if (status) { dev_dbg(&pdev->dev, "spi_register_master failed\n"); goto fail2; } - pm_runtime_enable(&pdev->dev); dev_info(&pdev->dev, "Coldfire QSPI bus driver\n"); return 0; fail2: + pm_runtime_disable(&pdev->dev); mcfqspi_cs_teardown(mcfqspi); fail1: clk_disable(mcfqspi->clk); |