i2c: tegra: Fix the error path in tegra_i2c_runtime_resume
authorSowjanya Komatineni <skomatineni@nvidia.com>
Mon, 27 Jul 2020 20:57:21 +0000 (13:57 -0700)
committerWolfram Sang <wsa@kernel.org>
Tue, 28 Jul 2020 16:32:09 +0000 (18:32 +0200)
tegra_i2c_runtime_resume does not disable prior enabled clocks
properly.

This patch fixes it.

Reviewed-by: Dmitry Osipenko <digetx@gmail.com>
Signed-off-by: Sowjanya Komatineni <skomatineni@nvidia.com>
Signed-off-by: Wolfram Sang <wsa@kernel.org>
drivers/i2c/busses/i2c-tegra.c

index c91307b..7b93c45 100644 (file)
@@ -665,18 +665,23 @@ static int __maybe_unused tegra_i2c_runtime_resume(struct device *dev)
        ret = clk_enable(i2c_dev->slow_clk);
        if (ret < 0) {
                dev_err(dev, "failed to enable slow clock: %d\n", ret);
-               return ret;
+               goto disable_fast_clk;
        }
 
        ret = clk_enable(i2c_dev->div_clk);
        if (ret < 0) {
                dev_err(i2c_dev->dev,
                        "Enabling div clk failed, err %d\n", ret);
-               clk_disable(i2c_dev->fast_clk);
-               return ret;
+               goto disable_slow_clk;
        }
 
        return 0;
+
+disable_slow_clk:
+       clk_disable(i2c_dev->slow_clk);
+disable_fast_clk:
+       clk_disable(i2c_dev->fast_clk);
+       return ret;
 }
 
 static int __maybe_unused tegra_i2c_runtime_suspend(struct device *dev)