lkml.org 
[lkml]   [2022]   [Jun]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.4 148/411] ASoC: wm2000: fix missing clk_disable_unprepare() on error in wm2000_anc_transition()
    Date
    From: Yang Yingliang <yangyingliang@huawei.com>

    [ Upstream commit be2af740e2a9c7134f2d8ab4f104006e110b13de ]

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

    Fixes: 514cfd6dd725 ("ASoC: wm2000: Integrate with clock API")
    Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
    Acked-by: Charles Keepax <ckeepax@opensource.cirrus.com>
    Link: https://lore.kernel.org/r/20220514091053.686416-1-yangyingliang@huawei.com
    Signed-off-by: Mark Brown <broonie@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    sound/soc/codecs/wm2000.c | 6 +++---
    1 file changed, 3 insertions(+), 3 deletions(-)

    diff --git a/sound/soc/codecs/wm2000.c b/sound/soc/codecs/wm2000.c
    index 72e165cc6443..97ece3114b3d 100644
    --- a/sound/soc/codecs/wm2000.c
    +++ b/sound/soc/codecs/wm2000.c
    @@ -536,7 +536,7 @@ static int wm2000_anc_transition(struct wm2000_priv *wm2000,
    {
    struct i2c_client *i2c = wm2000->i2c;
    int i, j;
    - int ret;
    + int ret = 0;

    if (wm2000->anc_mode == mode)
    return 0;
    @@ -566,13 +566,13 @@ static int wm2000_anc_transition(struct wm2000_priv *wm2000,
    ret = anc_transitions[i].step[j](i2c,
    anc_transitions[i].analogue);
    if (ret != 0)
    - return ret;
    + break;
    }

    if (anc_transitions[i].dest == ANC_OFF)
    clk_disable_unprepare(wm2000->mclk);

    - return 0;
    + return ret;
    }

    static int wm2000_anc_set_mode(struct wm2000_priv *wm2000)
    --
    2.35.1


    \
     
     \ /
      Last update: 2022-06-13 13:22    [W:3.191 / U:0.144 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site