Commit 1f79dc2f authored Aug 17, 2022 by Yang Yingliang Committed by Zheng Zengkai Aug 17, 2022

i2c: mt7621: fix missing clk_disable_unprepare() on error in mtk_i2c_probe()

stable inclusion
from stable-v5.10.118
commit 606011cb6a69b3f211c366aa10594845e6c5ad8c
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I5L686

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=606011cb6a69b3f211c366aa10594845e6c5ad8c



--------------------------------

[ Upstream commit a2537c98 ]

Fix the missing clk_disable_unprepare() before return
from mtk_i2c_probe() in the error handling case.

Fixes: d04913ec ("i2c: mt7621: Add MediaTek MT7621/7628/7688 I2C driver")
Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
Reviewed-by: Stefan Roese <sr@denx.de>
Signed-off-by: Wolfram Sang <wsa@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Zheng Zengkai <zhengzengkai@huawei.com>
Acked-by: Xie XiuQi <xiexiuqi@huawei.com>

parent 5a0366b6

drivers/i2c/busses/i2c-mt7621.c

+8 −2

Original line number	Diff line number	Diff line
		@@ -304,7 +304,8 @@ static int mtk_i2c_probe(struct platform_device *pdev)

		if (i2c->bus_freq == 0) {
		dev_warn(i2c->dev, "clock-frequency 0 not supported\n");
		return -EINVAL;
		ret = -EINVAL;
		goto err_disable_clk;
		}

		adap = &i2c->adap;
		@@ -322,10 +323,15 @@ static int mtk_i2c_probe(struct platform_device *pdev)

		ret = i2c_add_adapter(adap);
		if (ret < 0)
		return ret;
		goto err_disable_clk;

		dev_info(&pdev->dev, "clock %u kHz\n", i2c->bus_freq / 1000);

		return 0;

		err_disable_clk:
		clk_disable_unprepare(i2c->clk);

		return ret;
		}