lkml.org 
[lkml]   [2022]   [May]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.15 131/132] i2c: mt7621: fix missing clk_disable_unprepare() on error in mtk_i2c_probe()
    Date
    From: Yang Yingliang <yangyingliang@huawei.com>

    [ Upstream commit a2537c98a8a3b57002e54a262d180b9490bc7190 ]

    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>
    Signed-off-by: Wolfram Sang <wsa@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    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;
    }

    --
    2.35.1


    \
     
     \ /
      Last update: 2022-05-23 19:45    [W:4.108 / U:0.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site