projects
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
cf9c07d
)
ASoC: wm2000: fix missing clk_disable_unprepare() on error in wm2000_anc_transition()
author
Yang Yingliang
<yangyingliang@huawei.com>
Sat, 14 May 2022 09:10:53 +0000
(17:10 +0800)
committer
Greg Kroah-Hartman
<gregkh@linuxfoundation.org>
Thu, 9 Jun 2022 08:23:01 +0000
(10:23 +0200)
[ 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
patch
|
blob
|
history
diff --git
a/sound/soc/codecs/wm2000.c
b/sound/soc/codecs/wm2000.c
index 72e165cc64439750663f4857a06fd4c20a7ff38d..97ece3114b3dc8e5010a04fb82608a88b2ad852e 100644
(file)
--- 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)