summaryrefslogtreecommitdiffstats
path: root/sound/pci/oxygen/oxygen_lib.c
diff options
context:
space:
mode:
authorClemens Ladisch <clemens@ladisch.de>2010-11-02 17:18:23 +0100
committerTakashi Iwai <tiwai@suse.de>2010-11-03 08:26:13 +0100
commit31f86bacfc9c8f6a3f25fa991c1f373374a9f25b (patch)
tree305e4de678bdc4e6453f41dd35fcbc94eefe2a68 /sound/pci/oxygen/oxygen_lib.c
parentALSA: oxygen: merge HiFier driver into snd-oxygen (diff)
downloadlinux-31f86bacfc9c8f6a3f25fa991c1f373374a9f25b.tar.xz
linux-31f86bacfc9c8f6a3f25fa991c1f373374a9f25b.zip
ALSA: oxygen: add Kuroutoshikou CMI8787-HG2PCI support
Add support for the Kuroutoshikou CMI8787-HG2PCI sound card. [replaced non-latin letters in the patch by tiwai] Signed-off-by: Clemens Ladisch <clemens@ladisch.de> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/oxygen/oxygen_lib.c')
-rw-r--r--sound/pci/oxygen/oxygen_lib.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/oxygen/oxygen_lib.c b/sound/pci/oxygen/oxygen_lib.c
index e5ebe56fb0c5..2e6579962217 100644
--- a/sound/pci/oxygen/oxygen_lib.c
+++ b/sound/pci/oxygen/oxygen_lib.c
@@ -262,7 +262,7 @@ oxygen_search_pci_id(struct oxygen *chip, const struct pci_device_id ids[])
*/
subdevice = oxygen_read_eeprom(chip, 2);
/* use default ID if EEPROM is missing */
- if (subdevice == 0xffff)
+ if (subdevice == 0xffff && oxygen_read_eeprom(chip, 1) == 0xffff)
subdevice = 0x8788;
/*
* We use only the subsystem device ID for searching because it is