diff options
Diffstat (limited to 'sound/soc/codecs/ad1980.c')
-rw-r--r-- | sound/soc/codecs/ad1980.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/sound/soc/codecs/ad1980.c b/sound/soc/codecs/ad1980.c index 923b364a3e41..e3931cc5e66c 100644 --- a/sound/soc/codecs/ad1980.c +++ b/sound/soc/codecs/ad1980.c | |||
@@ -148,7 +148,6 @@ static struct snd_soc_dai_driver ad1980_dai = { | |||
148 | .rates = SNDRV_PCM_RATE_48000, | 148 | .rates = SNDRV_PCM_RATE_48000, |
149 | .formats = SND_SOC_STD_AC97_FMTS, }, | 149 | .formats = SND_SOC_STD_AC97_FMTS, }, |
150 | }; | 150 | }; |
151 | EXPORT_SYMBOL_GPL(ad1980_dai); | ||
152 | 151 | ||
153 | static int ad1980_reset(struct snd_soc_codec *codec, int try_warm) | 152 | static int ad1980_reset(struct snd_soc_codec *codec, int try_warm) |
154 | { | 153 | { |
@@ -200,18 +199,22 @@ static int ad1980_soc_probe(struct snd_soc_codec *codec) | |||
200 | } | 199 | } |
201 | 200 | ||
202 | /* Read out vendor ID to make sure it is ad1980 */ | 201 | /* Read out vendor ID to make sure it is ad1980 */ |
203 | if (ac97_read(codec, AC97_VENDOR_ID1) != 0x4144) | 202 | if (ac97_read(codec, AC97_VENDOR_ID1) != 0x4144) { |
203 | ret = -ENODEV; | ||
204 | goto reset_err; | 204 | goto reset_err; |
205 | } | ||
205 | 206 | ||
206 | vendor_id2 = ac97_read(codec, AC97_VENDOR_ID2); | 207 | vendor_id2 = ac97_read(codec, AC97_VENDOR_ID2); |
207 | 208 | ||
208 | if (vendor_id2 != 0x5370) { | 209 | if (vendor_id2 != 0x5370) { |
209 | if (vendor_id2 != 0x5374) | 210 | if (vendor_id2 != 0x5374) { |
211 | ret = -ENODEV; | ||
210 | goto reset_err; | 212 | goto reset_err; |
211 | else | 213 | } else { |
212 | printk(KERN_WARNING "ad1980: " | 214 | printk(KERN_WARNING "ad1980: " |
213 | "Found AD1981 - only 2/2 IN/OUT Channels " | 215 | "Found AD1981 - only 2/2 IN/OUT Channels " |
214 | "supported\n"); | 216 | "supported\n"); |
217 | } | ||
215 | } | 218 | } |
216 | 219 | ||
217 | /* unmute captures and playbacks volume */ | 220 | /* unmute captures and playbacks volume */ |