diff options
| author | Jarkko Nikula <jarkko.nikula@linux.intel.com> | 2018-03-07 17:05:04 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-03-07 15:08:04 +0000 |
| commit | e2b714afee32d368e0fda825c48181626979a551 (patch) | |
| tree | 078a205c7d69c7efd9b59aed3224eac4bac7125c /drivers/spi/spi-pxa2xx.c | |
| parent | 7928b2cbe55b2a410a0f5c1f154610059c57b1b2 (diff) | |
| download | blackbird-obmc-linux-e2b714afee32d368e0fda825c48181626979a551.tar.gz blackbird-obmc-linux-e2b714afee32d368e0fda825c48181626979a551.zip | |
spi: pxa2xx: Disable runtime PM if controller registration fails
Don't leave runtime PM enabled in case devm_spi_register_controller()
returns with an error. Otherwise runtime PM will complain when driver is
reloaded:
[ 693.855811] pxa2xx-spi pxa2xx-spi.13: Unbalanced pm_runtime_enable!
Signed-off-by: Jarkko Nikula <jarkko.nikula@linux.intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'drivers/spi/spi-pxa2xx.c')
| -rw-r--r-- | drivers/spi/spi-pxa2xx.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/spi/spi-pxa2xx.c b/drivers/spi/spi-pxa2xx.c index b0822d1dba29..56254b35875d 100644 --- a/drivers/spi/spi-pxa2xx.c +++ b/drivers/spi/spi-pxa2xx.c @@ -1802,6 +1802,8 @@ static int pxa2xx_spi_probe(struct platform_device *pdev) return status; out_error_clock_enabled: + pm_runtime_put_noidle(&pdev->dev); + pm_runtime_disable(&pdev->dev); clk_disable_unprepare(ssp->clk); pxa2xx_spi_dma_release(drv_data); free_irq(ssp->irq, drv_data); |
