mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-13 14:14:37 +00:00
i2c: mt7621: fix missing clk_disable_unprepare() on error in mtk_i2c_probe()
[ Upstream commita2537c98a8
] Fix the missing clk_disable_unprepare() before return from mtk_i2c_probe() in the error handling case. Fixes:d04913ec5f
("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>
This commit is contained in:
parent
268f52a166
commit
b1427a98ed
1 changed files with 8 additions and 2 deletions
|
@ -304,7 +304,8 @@ static int mtk_i2c_probe(struct platform_device *pdev)
|
||||||
|
|
||||||
if (i2c->bus_freq == 0) {
|
if (i2c->bus_freq == 0) {
|
||||||
dev_warn(i2c->dev, "clock-frequency 0 not supported\n");
|
dev_warn(i2c->dev, "clock-frequency 0 not supported\n");
|
||||||
return -EINVAL;
|
ret = -EINVAL;
|
||||||
|
goto err_disable_clk;
|
||||||
}
|
}
|
||||||
|
|
||||||
adap = &i2c->adap;
|
adap = &i2c->adap;
|
||||||
|
@ -322,10 +323,15 @@ static int mtk_i2c_probe(struct platform_device *pdev)
|
||||||
|
|
||||||
ret = i2c_add_adapter(adap);
|
ret = i2c_add_adapter(adap);
|
||||||
if (ret < 0)
|
if (ret < 0)
|
||||||
return ret;
|
goto err_disable_clk;
|
||||||
|
|
||||||
dev_info(&pdev->dev, "clock %u kHz\n", i2c->bus_freq / 1000);
|
dev_info(&pdev->dev, "clock %u kHz\n", i2c->bus_freq / 1000);
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
|
||||||
|
err_disable_clk:
|
||||||
|
clk_disable_unprepare(i2c->clk);
|
||||||
|
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue