| From 65e318e17358a3fd4fcb5a69d89b14016dee2f06 Mon Sep 17 00:00:00 2001 |
| From: Lukas Wunner <lukas@wunner.de> |
| Date: Mon, 25 May 2020 14:25:03 +0200 |
| Subject: spi: pxa2xx: Fix runtime PM ref imbalance on probe error |
| |
| From: Lukas Wunner <lukas@wunner.de> |
| |
| commit 65e318e17358a3fd4fcb5a69d89b14016dee2f06 upstream. |
| |
| The PXA2xx SPI driver releases a runtime PM ref in the probe error path |
| even though it hasn't acquired a ref earlier. |
| |
| Apparently commit e2b714afee32 ("spi: pxa2xx: Disable runtime PM if |
| controller registration fails") sought to copy-paste the invocation of |
| pm_runtime_disable() from pxa2xx_spi_remove(), but erroneously copied |
| the call to pm_runtime_put_noidle() as well. Drop it. |
| |
| Fixes: e2b714afee32 ("spi: pxa2xx: Disable runtime PM if controller registration fails") |
| Signed-off-by: Lukas Wunner <lukas@wunner.de> |
| Reviewed-by: Jarkko Nikula <jarkko.nikula@linux.intel.com> |
| Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> |
| Cc: stable@vger.kernel.org # v4.17+ |
| Cc: Jarkko Nikula <jarkko.nikula@linux.intel.com> |
| Link: https://lore.kernel.org/r/58b2ac6942ca1f91aaeeafe512144bc5343e1d84.1590408496.git.lukas@wunner.de |
| Signed-off-by: Mark Brown <broonie@kernel.org> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/spi/spi-pxa2xx.c | 1 - |
| 1 file changed, 1 deletion(-) |
| |
| --- a/drivers/spi/spi-pxa2xx.c |
| +++ b/drivers/spi/spi-pxa2xx.c |
| @@ -1889,7 +1889,6 @@ static int pxa2xx_spi_probe(struct platf |
| return status; |
| |
| out_error_pm_runtime_enabled: |
| - pm_runtime_put_noidle(&pdev->dev); |
| pm_runtime_disable(&pdev->dev); |
| |
| out_error_clock_enabled: |
