summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorFabio Estevam <fabio.estevam@freescale.com>2015-06-20 20:55:52 +0200
committerMark Brown <broonie@kernel.org>2015-07-08 20:09:12 +0200
commitcef6daa919c6912c4da629c3cee9c789f90583b1 (patch)
tree06cb37f03c60006a544eb66f895a67c78f4b9c66 /sound
parentASoC: wm8731: initialize the hardware when loading the codec driver (diff)
downloadlinux-cef6daa919c6912c4da629c3cee9c789f90583b1.tar.xz
linux-cef6daa919c6912c4da629c3cee9c789f90583b1.zip
ASoC: wm8731: Check for clk_prepare_enable() error
clk_prepare_enable() may fail, so we should better check its return value and propagate it in the case of error. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/codecs/wm8731.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/sound/soc/codecs/wm8731.c b/sound/soc/codecs/wm8731.c
index f22935a36a0a..628d50c40cc4 100644
--- a/sound/soc/codecs/wm8731.c
+++ b/sound/soc/codecs/wm8731.c
@@ -496,8 +496,11 @@ static int wm8731_set_bias_level(struct snd_soc_codec *codec,
switch (level) {
case SND_SOC_BIAS_ON:
- if (wm8731->mclk)
- clk_prepare_enable(wm8731->mclk);
+ if (wm8731->mclk) {
+ ret = clk_prepare_enable(wm8731->mclk);
+ if (ret)
+ return ret;
+ }
break;
case SND_SOC_BIAS_PREPARE:
break;