Patch "spi: spi-rockchip: Fix missing unwind goto in rockchip_sfc_probe()" has been added to the 6.2-stable tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



This is a note to let you know that I've just added the patch titled

    spi: spi-rockchip: Fix missing unwind goto in rockchip_sfc_probe()

to the 6.2-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     spi-spi-rockchip-fix-missing-unwind-goto-in-rockchip.patch
and it can be found in the queue-6.2 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit 3aa5406e17eaca5b79d964253db8d729c5e38adc
Author: Li Lanzhe <u202212060@xxxxxxxxxxx>
Date:   Wed Apr 19 07:50:29 2023 -0400

    spi: spi-rockchip: Fix missing unwind goto in rockchip_sfc_probe()
    
    [ Upstream commit 359f5b0d4e26b7a7bcc574d6148b31a17cefe47d ]
    
    If devm_request_irq() fails, then we are directly return 'ret' without
    clk_disable_unprepare(sfc->clk) and clk_disable_unprepare(sfc->hclk).
    
    Fix this by changing direct return to a goto 'err_irq'.
    
    Fixes: 0b89fc0a367e ("spi: rockchip-sfc: add rockchip serial flash controller")
    Signed-off-by: Li Lanzhe <u202212060@xxxxxxxxxxx>
    Reviewed-by: Dongliang Mu <dzm91@xxxxxxxxxxx>
    Link: https://lore.kernel.org/r/20230419115030.6029-1-u202212060@xxxxxxxxxxx
    Signed-off-by: Mark Brown <broonie@xxxxxxxxxx>
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/drivers/spi/spi-rockchip-sfc.c b/drivers/spi/spi-rockchip-sfc.c
index bd87d3c92dd33..69347b6bf60cd 100644
--- a/drivers/spi/spi-rockchip-sfc.c
+++ b/drivers/spi/spi-rockchip-sfc.c
@@ -632,7 +632,7 @@ static int rockchip_sfc_probe(struct platform_device *pdev)
 	if (ret) {
 		dev_err(dev, "Failed to request irq\n");
 
-		return ret;
+		goto err_irq;
 	}
 
 	ret = rockchip_sfc_init(sfc);



[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Index of Archives]     [Linux USB Devel]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]

  Powered by Linux