| Message ID | 20220514023148.305457-1-yangyingliang@huawei.com |
|---|---|
| State | Accepted |
| Commit | a2537c98a8a3b57002e54a262d180b9490bc7190 |
| Headers | show |
| Series | [-next,v2,1/2] i2c: mt7621: fix missing clk_disable_unprepare() on error in mtk_i2c_probe() | expand |
On 14.05.22 04:31, Yang Yingliang wrote: > Fix the missing clk_disable_unprepare() before return > from mtk_i2c_probe() in the error handling case. > > Fixes: d04913ec5f89 ("i2c: mt7621: Add MediaTek MT7621/7628/7688 I2C driver") > Signed-off-by: Yang Yingliang <yangyingliang@huawei.com> Reviewed-by: Stefan Roese <sr@denx.de> Thanks, Stefan > --- > v2: add return 0 in normal path. > --- > drivers/i2c/busses/i2c-mt7621.c | 10 ++++++++-- > 1 file changed, 8 insertions(+), 2 deletions(-) > > diff --git a/drivers/i2c/busses/i2c-mt7621.c b/drivers/i2c/busses/i2c-mt7621.c > index 45fe4a7fe0c0..901f0fb04fee 100644 > --- a/drivers/i2c/busses/i2c-mt7621.c > +++ b/drivers/i2c/busses/i2c-mt7621.c > @@ -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; > } > Viele Grüße, Stefan Roese
On Sat, May 14, 2022 at 10:31:47AM +0800, Yang Yingliang wrote: > Fix the missing clk_disable_unprepare() before return > from mtk_i2c_probe() in the error handling case. > > Fixes: d04913ec5f89 ("i2c: mt7621: Add MediaTek MT7621/7628/7688 I2C driver") > Signed-off-by: Yang Yingliang <yangyingliang@huawei.com> Applied to for-current, thanks!
diff --git a/drivers/i2c/busses/i2c-mt7621.c b/drivers/i2c/busses/i2c-mt7621.c index 45fe4a7fe0c0..901f0fb04fee 100644 --- a/drivers/i2c/busses/i2c-mt7621.c +++ b/drivers/i2c/busses/i2c-mt7621.c @@ -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; }
Fix the missing clk_disable_unprepare() before return from mtk_i2c_probe() in the error handling case. Fixes: d04913ec5f89 ("i2c: mt7621: Add MediaTek MT7621/7628/7688 I2C driver") Signed-off-by: Yang Yingliang <yangyingliang@huawei.com> --- v2: add return 0 in normal path. --- drivers/i2c/busses/i2c-mt7621.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)