diff options
author | Rene Herman <rene.herman@gmail.com> | 2008-08-05 03:33:33 -0400 |
---|---|---|
committer | Jaroslav Kysela <perex@perex.cz> | 2008-08-06 09:40:11 -0400 |
commit | 6ddfa7432adc24c7471abe9d338a78540d0d025b (patch) | |
tree | 877d2a1effcb66f22b7f632d6bd335a3093dba21 /sound | |
parent | ebae22590dccd2b8495c97e85290f5e07af7dc62 (diff) |
ALSA: wss_lib: fix AZT2320 probe.
After the transition from cs4321_lib to wss_lib, azt2320 probe visits
snd_ad1848_probe during detection. It expects register 0 (LEFT_INPUT)
to be able to retain the value 0xaa during detection but AZT2320 does
not support MIC gain meaning it reads back as 0x8a instead.
Signed-off-by: Rene Herman <rene.herman@gmail.com>
Acked-by: Krzysztof Helt <krzysztof.h1@wp.pl>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
Diffstat (limited to 'sound')
-rw-r--r-- | sound/isa/wss/wss_lib.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/sound/isa/wss/wss_lib.c b/sound/isa/wss/wss_lib.c index fff8a3b79fdf..866e8686dbe7 100644 --- a/sound/isa/wss/wss_lib.c +++ b/sound/isa/wss/wss_lib.c | |||
@@ -1168,11 +1168,13 @@ static int snd_ad1848_probe(struct snd_wss *chip) | |||
1168 | ad1847 = 1; | 1168 | ad1847 = 1; |
1169 | break; | 1169 | break; |
1170 | } | 1170 | } |
1171 | if (snd_wss_in(chip, CS4231_LEFT_INPUT) == 0xaa && | 1171 | if (rev == 0x45) { |
1172 | rev == 0x45) { | 1172 | rev = snd_wss_in(chip, CS4231_LEFT_INPUT); |
1173 | spin_unlock_irqrestore(&chip->reg_lock, flags); | 1173 | if (rev == 0xaa || rev == 0x8a) { |
1174 | id = 1; | 1174 | spin_unlock_irqrestore(&chip->reg_lock, flags); |
1175 | break; | 1175 | id = 1; |
1176 | break; | ||
1177 | } | ||
1176 | } | 1178 | } |
1177 | spin_unlock_irqrestore(&chip->reg_lock, flags); | 1179 | spin_unlock_irqrestore(&chip->reg_lock, flags); |
1178 | } | 1180 | } |