summaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs/ad1980.c
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@gmail.com>2011-09-06 10:37:48 +0800
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-09-08 15:39:51 -0700
commit0f73644f372281f2f9c33a0459dfdfc8bc77fbda (patch)
treee4b0f7af29cda197c2fc5d64b717aa4d9b4a5b99 /sound/soc/codecs/ad1980.c
parent3ed464659a1d83a87f4ef79fab4d85a8dcf677c9 (diff)
downloadblackbird-op-linux-0f73644f372281f2f9c33a0459dfdfc8bc77fbda.tar.gz
blackbird-op-linux-0f73644f372281f2f9c33a0459dfdfc8bc77fbda.zip
ASoC: ad1980: Return proper error if vendor id mismatch
Return -ENODEV instead of 0 if vendor id mismatch. Signed-off-by: Axel Lin <axel.lin@gmail.com> Acked-by: Liam Girdwood <lrg@ti.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/codecs/ad1980.c')
-rw-r--r--sound/soc/codecs/ad1980.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/sound/soc/codecs/ad1980.c b/sound/soc/codecs/ad1980.c
index 923b364a3e41..4c0fc30a4ccb 100644
--- a/sound/soc/codecs/ad1980.c
+++ b/sound/soc/codecs/ad1980.c
@@ -200,18 +200,22 @@ static int ad1980_soc_probe(struct snd_soc_codec *codec)
}
/* Read out vendor ID to make sure it is ad1980 */
- if (ac97_read(codec, AC97_VENDOR_ID1) != 0x4144)
+ if (ac97_read(codec, AC97_VENDOR_ID1) != 0x4144) {
+ ret = -ENODEV;
goto reset_err;
+ }
vendor_id2 = ac97_read(codec, AC97_VENDOR_ID2);
if (vendor_id2 != 0x5370) {
- if (vendor_id2 != 0x5374)
+ if (vendor_id2 != 0x5374) {
+ ret = -ENODEV;
goto reset_err;
- else
+ } else {
printk(KERN_WARNING "ad1980: "
"Found AD1981 - only 2/2 IN/OUT Channels "
"supported\n");
+ }
}
/* unmute captures and playbacks volume */
OpenPOWER on IntegriCloud