Skip to content

Commit

Permalink
i2c: mt7621: fix missing clk_disable_unprepare() on error in mtk_i2c_…
Browse files Browse the repository at this point in the history
…probe()

[ Upstream commit a2537c9 ]

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

Fixes: d04913e ("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>
  • Loading branch information
Yang Yingliang authored and gregkh committed May 25, 2022
1 parent 030de84 commit 606011c
Showing 1 changed file with 8 additions and 2 deletions.
10 changes: 8 additions & 2 deletions drivers/i2c/busses/i2c-mt7621.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
}

Expand Down

0 comments on commit 606011c

Please sign in to comment.