FAILED: patch "[PATCH] spi: mt7621: Disable clock in probe error path" failed to apply to 4.19-stable tree
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 24f7033405abe195224ec793dbc3d7a27dec0b98 Mon Sep 17 00:00:00 2001
From: Lukas Wunner lukas@wunner.de Date: Mon, 7 Dec 2020 09:17:13 +0100 Subject: [PATCH] spi: mt7621: Disable clock in probe error path
Commit 702b15cb9712 ("spi: mt7621: fix missing clk_disable_unprepare() on error in mt7621_spi_probe") sought to disable the SYS clock on probe errors, but only did so for 2 of 3 potentially failing calls: The clock needs to be disabled on failure of devm_spi_register_controller() as well.
Moreover, the commit purports to fix a bug in commit cbd66c626e16 ("spi: mt7621: Move SPI driver out of staging") but in reality the bug has existed since the driver was first introduced.
Fixes: 1ab7f2a43558 ("staging: mt7621-spi: add mt7621 support") Signed-off-by: Lukas Wunner lukas@wunner.de Cc: stable@vger.kernel.org # v4.17+: 702b15cb9712: spi: mt7621: fix missing clk_disable_unprepare() on error in mt7621_spi_probe Cc: stable@vger.kernel.org # v4.17+ Cc: Qinglang Miao miaoqinglang@huawei.com Link: https://lore.kernel.org/r/36ad42760087952fb7c10aae7d2628547c26a7ec.160728688... Signed-off-by: Mark Brown broonie@kernel.org
diff --git a/drivers/spi/spi-mt7621.c b/drivers/spi/spi-mt7621.c index 2cdae7994e2a..e227700808cb 100644 --- a/drivers/spi/spi-mt7621.c +++ b/drivers/spi/spi-mt7621.c @@ -382,7 +382,11 @@ static int mt7621_spi_probe(struct platform_device *pdev) return ret; }
- return devm_spi_register_controller(&pdev->dev, master); + ret = devm_spi_register_controller(&pdev->dev, master); + if (ret) + clk_disable_unprepare(clk); + + return ret; }
static int mt7621_spi_remove(struct platform_device *pdev)
On Mon, Dec 28, 2020 at 12:07:08PM +0100, 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.
Here's the backport of 24f7033405ab to v4.19.192:
-- >8 -- From: Lukas Wunner lukas@wunner.de Date: Mon, 7 Dec 2020 09:17:13 +0100 Subject: [PATCH] spi: mt7621: Disable clock in probe error path
commit 24f7033405abe195224ec793dbc3d7a27dec0b98 upstream.
Commit 702b15cb9712 ("spi: mt7621: fix missing clk_disable_unprepare() on error in mt7621_spi_probe") sought to disable the SYS clock on probe errors, but only did so for 2 of 3 potentially failing calls: The clock needs to be disabled on failure of spi_register_master() as well.
Moreover, the commit purports to fix a bug in commit cbd66c626e16 ("spi: mt7621: Move SPI driver out of staging") but in reality the bug has existed since the driver was first introduced.
Fixes: 1ab7f2a43558 ("staging: mt7621-spi: add mt7621 support") Signed-off-by: Lukas Wunner lukas@wunner.de Cc: stable@vger.kernel.org # v4.17+: 702b15cb9712: spi: mt7621: fix missing clk_disable_unprepare() on error in mt7621_spi_probe Cc: stable@vger.kernel.org # v4.17+ Cc: Qinglang Miao miaoqinglang@huawei.com Link: https://lore.kernel.org/r/36ad42760087952fb7c10aae7d2628547c26a7ec.160728688... Signed-off-by: Mark Brown broonie@kernel.org [lukas: backport to v4.19.192] Signed-off-by: Lukas Wunner lukas@wunner.de --- drivers/staging/mt7621-spi/spi-mt7621.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/drivers/staging/mt7621-spi/spi-mt7621.c b/drivers/staging/mt7621-spi/spi-mt7621.c index 33c747bc8320..ebfbe5ee479a 100644 --- a/drivers/staging/mt7621-spi/spi-mt7621.c +++ b/drivers/staging/mt7621-spi/spi-mt7621.c @@ -487,7 +487,11 @@ static int mt7621_spi_probe(struct platform_device *pdev)
mt7621_spi_reset(rs, 0);
- return spi_register_master(master); + ret = spi_register_master(master); + if (ret) + clk_disable_unprepare(clk); + + return ret; }
static int mt7621_spi_remove(struct platform_device *pdev)
linux-stable-mirror@lists.linaro.org
-
gregkh＠linuxfoundation.org -
Lukas Wunner