FAILED: patch "[PATCH] spi: pxa2xx: Fix runtime PM ref imbalance on probe error" failed to apply to 4.19-stable tree

FAILED: patch "[PATCH] spi: pxa2xx: Fix runtime PM ref imbalance on probe error" failed to apply to 4.19-stable tree

[gregkh]

The patch below does not apply to the 4.19-stable tree.
If someone wants it applied there, or to any other stable or longterm
tree, then please email the backport, including the original git commit
id to <stable@vger.kernel.org>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

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: [PATCH] spi: pxa2xx: Fix runtime PM ref imbalance on probe error

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>

diff --git a/drivers/spi/spi-pxa2xx.c b/drivers/spi/spi-pxa2xx.c
index f456ce18f79e..f6e87344a36c 100644
--- a/drivers/spi/spi-pxa2xx.c
+++ b/drivers/spi/spi-pxa2xx.c
@@ -1893,7 +1893,6 @@ static int pxa2xx_spi_probe(struct platform_device *pdev)
 	return status;
 
 out_error_pm_runtime_enabled:
-	pm_runtime_put_noidle(&pdev->dev);
 	pm_runtime_disable(&pdev->dev);
 
 out_error_clock_enabled:

Re: FAILED: patch "[PATCH] spi: pxa2xx: Fix runtime PM ref imbalance on probe error" failed to apply to 4.19-stable tree

[Sasha Levin]

On Mon, Jun 15, 2020 at 05:21:37PM +0200, gregkh@linuxfoundation.org wrote:
>
>The patch below does not apply to the 4.19-stable tree.
>If someone wants it applied there, or to any other stable or longterm
>tree, then please email the backport, including the original git commit
>id to <stable@vger.kernel.org>.
>
>thanks,
>
>greg k-h
>
>------------------ original commit in Linus's tree ------------------
>
>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: [PATCH] spi: pxa2xx: Fix runtime PM ref imbalance on probe error
>
>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>

I've also grabbed 1274204542f6 ("spi: pxa2xx: Balance runtime PM
enable/disable on error") and worked around the master -> controller
rename. queued for 4.19.

-- 
Thanks,
Sasha