| Message ID | 20220514091053.686416-1-yangyingliang@huawei.com |
|---|---|
| State | Accepted |
| Commit | be2af740e2a9c7134f2d8ab4f104006e110b13de |
| Headers | show |
| Series | [-next] ASoC: wm2000: fix missing clk_disable_unprepare() on error in wm2000_anc_transition() | expand |
On Sat, May 14, 2022 at 05:10:53PM +0800, Yang Yingliang wrote: > 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> Thanks, Charles
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)
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> --- sound/soc/codecs/wm2000.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)