From 894f90d326a282a629009e04e0916381b363c406 Mon Sep 17 00:00:00 2001 From: Axel Lin Date: Tue, 6 Sep 2011 10:37:48 +0800 Subject: [PATCH] --- yaml --- r: 270566 b: refs/heads/master c: 0f73644f372281f2f9c33a0459dfdfc8bc77fbda h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/sound/soc/codecs/ad1980.c | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index a828508820f9..a3a9edc9a0f8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3ed464659a1d83a87f4ef79fab4d85a8dcf677c9 +refs/heads/master: 0f73644f372281f2f9c33a0459dfdfc8bc77fbda diff --git a/trunk/sound/soc/codecs/ad1980.c b/trunk/sound/soc/codecs/ad1980.c index 923b364a3e41..4c0fc30a4ccb 100644 --- a/trunk/sound/soc/codecs/ad1980.c +++ b/trunk/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 */