]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
i2c: qcom-geni: fix missing clk_disable_unprepare() and geni_se_resources_off()
authorYang Yingliang <yangyingliang@huawei.com>
Thu, 30 Nov 2023 01:43:24 +0000 (09:43 +0800)
committerWolfram Sang <wsa@kernel.org>
Tue, 19 Dec 2023 17:14:17 +0000 (18:14 +0100)
Add missing clk_disable_unprepare() and geni_se_resources_off() in the error
path in geni_i2c_probe().

Fixes: 14d02fbadb5d ("i2c: qcom-geni: add desc struct to prepare support for I2C Master Hub variant")
Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
Reviewed-by: Andi Shyti <andi.shyti@kernel.org>
Signed-off-by: Wolfram Sang <wsa@kernel.org>
drivers/i2c/busses/i2c-qcom-geni.c

index 6d829ed2f868f733540cf9cee1cbb2714e45b345..0d2e7171e3a6f94a66d2ff85861723e0f2caea00 100644 (file)
@@ -858,6 +858,7 @@ static int geni_i2c_probe(struct platform_device *pdev)
        ret = geni_se_resources_on(&gi2c->se);
        if (ret) {
                dev_err(dev, "Error turning on resources %d\n", ret);
+               clk_disable_unprepare(gi2c->core_clk);
                return ret;
        }
        proto = geni_se_read_proto(&gi2c->se);
@@ -877,8 +878,11 @@ static int geni_i2c_probe(struct platform_device *pdev)
                /* FIFO is disabled, so we can only use GPI DMA */
                gi2c->gpi_mode = true;
                ret = setup_gpi_dma(gi2c);
-               if (ret)
+               if (ret) {
+                       geni_se_resources_off(&gi2c->se);
+                       clk_disable_unprepare(gi2c->core_clk);
                        return dev_err_probe(dev, ret, "Failed to setup GPI DMA mode\n");
+               }
 
                dev_dbg(dev, "Using GPI DMA mode for I2C\n");
        } else {
@@ -891,6 +895,8 @@ static int geni_i2c_probe(struct platform_device *pdev)
 
                if (!tx_depth) {
                        dev_err(dev, "Invalid TX FIFO depth\n");
+                       geni_se_resources_off(&gi2c->se);
+                       clk_disable_unprepare(gi2c->core_clk);
                        return -EINVAL;
                }