]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
spi: cadence-quadspi: add missing clk_disable_unprepare() in cqspi_probe()
authorYang Yingliang <yangyingliang@huawei.com>
Wed, 29 Nov 2023 08:11:47 +0000 (16:11 +0800)
committerMark Brown <broonie@kernel.org>
Mon, 4 Dec 2023 12:38:39 +0000 (12:38 +0000)
cqspi_jh7110_clk_init() is called after clk_prepare_enable(cqspi->clk),
if it fails, it should goto label 'probe_reset_failed' to disable
cqspi->clk.

In the error path after calling cqspi_jh7110_clk_init(),
cqspi_jh7110_disable_clk() need be called.

Fixes: 33f1ef6d4eb6 ("spi: cadence-quadspi: Add clock configuration for StarFive JH7110 QSPI")
Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
Link: https://lore.kernel.org/r/20231129081147.628004-1-yangyingliang@huawei.com
Signed-off-by: Mark Brown <broonie@kernel.org>
drivers/spi/spi-cadence-quadspi.c

index 3d7bf62da11cb649b1f7855588add5700fa8adb6..f94e0d370d466e9742261a84a567593b8073f169 100644 (file)
@@ -1840,7 +1840,7 @@ static int cqspi_probe(struct platform_device *pdev)
                if (ddata->jh7110_clk_init) {
                        ret = cqspi_jh7110_clk_init(pdev, cqspi);
                        if (ret)
-                               goto probe_clk_failed;
+                               goto probe_reset_failed;
                }
 
                if (of_device_is_compatible(pdev->dev.of_node,
@@ -1901,6 +1901,8 @@ static int cqspi_probe(struct platform_device *pdev)
 probe_setup_failed:
        cqspi_controller_enable(cqspi, 0);
 probe_reset_failed:
+       if (cqspi->is_jh7110)
+               cqspi_jh7110_disable_clk(pdev, cqspi);
        clk_disable_unprepare(cqspi->clk);
 probe_clk_failed:
        return ret;