diff options
author | Takashi Iwai <tiwai@suse.de> | 2009-06-08 12:29:38 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2009-06-08 12:30:37 -0400 |
commit | 09521d2e3edd0bf02b66e5b8c13f1559f2d6958a (patch) | |
tree | bc42e16c5ca59e4113171256b625f3de397a5d9f /sound/pci/ctxfi/ctatc.c | |
parent | 9470195a9cd13e6d90221b8b5d897e9232da8d28 (diff) |
ALSA: ctxfi - Fix wrong model id for UAA
CTUAA should be checked instead of CTHENDRIX. The latter is for 20k2 chip.
Also, fixed the detection of UAA/HENDRIX models by fixing the mask bits.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/ctxfi/ctatc.c')
-rw-r--r-- | sound/pci/ctxfi/ctatc.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sound/pci/ctxfi/ctatc.c b/sound/pci/ctxfi/ctatc.c index 002a70e0b13a..4e25b24848bd 100644 --- a/sound/pci/ctxfi/ctatc.c +++ b/sound/pci/ctxfi/ctatc.c | |||
@@ -44,8 +44,8 @@ static struct snd_pci_quirk __devinitdata subsys_20k1_list[] = { | |||
44 | SND_PCI_QUIRK(PCI_VENDOR_ID_CREATIVE, 0x002f, "SB055x", CTSB055X), | 44 | SND_PCI_QUIRK(PCI_VENDOR_ID_CREATIVE, 0x002f, "SB055x", CTSB055X), |
45 | SND_PCI_QUIRK(PCI_VENDOR_ID_CREATIVE, 0x0029, "SB073x", CTSB073X), | 45 | SND_PCI_QUIRK(PCI_VENDOR_ID_CREATIVE, 0x0029, "SB073x", CTSB073X), |
46 | SND_PCI_QUIRK(PCI_VENDOR_ID_CREATIVE, 0x0031, "SB073x", CTSB073X), | 46 | SND_PCI_QUIRK(PCI_VENDOR_ID_CREATIVE, 0x0031, "SB073x", CTSB073X), |
47 | SND_PCI_QUIRK_MASK(PCI_VENDOR_ID_CREATIVE, 0x6000, | 47 | SND_PCI_QUIRK_MASK(PCI_VENDOR_ID_CREATIVE, 0xf000, 0x6000, |
48 | PCI_SUBDEVICE_ID_CREATIVE_HENDRIX, "UAA", CTUAA), | 48 | "UAA", CTUAA), |
49 | SND_PCI_QUIRK_VENDOR(PCI_VENDOR_ID_CREATIVE, | 49 | SND_PCI_QUIRK_VENDOR(PCI_VENDOR_ID_CREATIVE, |
50 | "Unknown", CT20K1_UNKNOWN), | 50 | "Unknown", CT20K1_UNKNOWN), |
51 | { } /* terminator */ | 51 | { } /* terminator */ |
@@ -60,8 +60,9 @@ static struct snd_pci_quirk __devinitdata subsys_20k2_list[] = { | |||
60 | "SB0880", CTSB0880), | 60 | "SB0880", CTSB0880), |
61 | SND_PCI_QUIRK(PCI_VENDOR_ID_CREATIVE, PCI_SUBDEVICE_ID_CREATIVE_SB08803, | 61 | SND_PCI_QUIRK(PCI_VENDOR_ID_CREATIVE, PCI_SUBDEVICE_ID_CREATIVE_SB08803, |
62 | "SB0880", CTSB0880), | 62 | "SB0880", CTSB0880), |
63 | SND_PCI_QUIRK_MASK(PCI_VENDOR_ID_CREATIVE, 0x6000, | 63 | SND_PCI_QUIRK_MASK(PCI_VENDOR_ID_CREATIVE, 0xf000, |
64 | PCI_SUBDEVICE_ID_CREATIVE_HENDRIX, "UAA", CTHENDRIX), | 64 | PCI_SUBDEVICE_ID_CREATIVE_HENDRIX, "HENDRIX", |
65 | CTHENDRIX), | ||
65 | { } /* terminator */ | 66 | { } /* terminator */ |
66 | }; | 67 | }; |
67 | 68 | ||