summaryrefslogtreecommitdiffstats
path: root/sound/soc
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2009-02-18 21:06:01 +0000
committerMark Brown <broonie@opensource.wolfsonmicro.com>2009-02-18 21:06:01 +0000
commit519cf2df5fb50c6d24412b2421ce2d1ff0346163 (patch)
treec82ff265854a44e7fcfbe5051a730b5fa0c0b58d /sound/soc
parent6bab83fd886564e96abcff62862732159535f600 (diff)
downloadkernel-crypto-519cf2df5fb50c6d24412b2421ce2d1ff0346163.tar.gz
kernel-crypto-519cf2df5fb50c6d24412b2421ce2d1ff0346163.tar.xz
kernel-crypto-519cf2df5fb50c6d24412b2421ce2d1ff0346163.zip
ASoC: Check for errors when writing WM8731 reset register
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc')
-rw-r--r--sound/soc/codecs/wm8731.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/sound/soc/codecs/wm8731.c b/sound/soc/codecs/wm8731.c
index 4191bdb803b..9c9fc3b5a6c 100644
--- a/sound/soc/codecs/wm8731.c
+++ b/sound/soc/codecs/wm8731.c
@@ -574,9 +574,14 @@ static int wm8731_register(struct wm8731_priv *wm8731)
memcpy(codec->reg_cache, wm8731_reg, sizeof(wm8731_reg));
+ ret = wm8731_reset(codec);
+ if (ret < 0) {
+ dev_err(codec->dev, "Failed to issue reset\n");
+ return ret;
+ }
+
wm8731_dai.dev = codec->dev;
- wm8731_reset(codec);
wm8731_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
/* Latch the update bits */