diff options
| author | Lubomir Rintel <lkundrak@v3.sk> | 2019-07-19 14:27:13 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-07-22 13:05:22 +0100 |
| commit | 1274204542f683e1d8491ebe9cc86284d5a8ebcc (patch) | |
| tree | 61792d7bf27a69e3173822aa2d87e1e7970d53f8 /drivers/spi | |
| parent | 2922d1cc1696200a3e1fd6d82a7798fcd2cadf12 (diff) | |
| download | linux-0-day-1274204542f683e1d8491ebe9cc86284d5a8ebcc.tar.gz linux-0-day-1274204542f683e1d8491ebe9cc86284d5a8ebcc.tar.xz | |
spi: pxa2xx: Balance runtime PM enable/disable on error
Don't undo the PM initialization if we error out before we managed to
initialize it. The call to pm_runtime_disable() without being preceded
by pm_runtime_enable() would disturb the balance of the Force.
In practice, this happens if we fail to allocate any of the GPIOS ("cs",
"ready") due to -EPROBE_DEFER because we're getting probled before the
GPIO driver.
Signed-off-by: Lubomir Rintel <lkundrak@v3.sk>
Link: https://lore.kernel.org/r/20190719122713.3444318-1-lkundrak@v3.sk
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'drivers/spi')
| -rw-r--r-- | drivers/spi/spi-pxa2xx.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/spi/spi-pxa2xx.c b/drivers/spi/spi-pxa2xx.c index fc7ab4b268802..22513caf20006 100644 --- a/drivers/spi/spi-pxa2xx.c +++ b/drivers/spi/spi-pxa2xx.c @@ -1831,14 +1831,16 @@ static int pxa2xx_spi_probe(struct platform_device *pdev) status = devm_spi_register_controller(&pdev->dev, controller); if (status != 0) { dev_err(&pdev->dev, "problem registering spi controller\n"); - goto out_error_clock_enabled; + goto out_error_pm_runtime_enabled; } return status; -out_error_clock_enabled: +out_error_pm_runtime_enabled: pm_runtime_put_noidle(&pdev->dev); pm_runtime_disable(&pdev->dev); + +out_error_clock_enabled: clk_disable_unprepare(ssp->clk); out_error_dma_irq_alloc: |