summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2005-06-10 19:54:23 +0200
committerJaroslav Kysela <perex@suse.cz>2005-06-22 12:28:47 +0200
commit5ecd7022f52872db32eddf85a527064ed7b522a3 (patch)
tree676272c03d675c201c0787390ec66790f09625a3 /sound
parent05acb863a27e7f82d81c422b977415fa80b99f96 (diff)
downloadlinux-3.10-5ecd7022f52872db32eddf85a527064ed7b522a3.tar.gz
linux-3.10-5ecd7022f52872db32eddf85a527064ed7b522a3.tar.bz2
linux-3.10-5ecd7022f52872db32eddf85a527064ed7b522a3.zip
[ALSA] hda-codec - Allow sub_device=0 in board config check
HDA Codec driver Allow sub_device=0 in board config check. This means that every device with the given sub vendor ID will match. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
-rw-r--r--sound/pci/hda/hda_codec.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c
index 8805928167f..f62d1d5eb7f 100644
--- a/sound/pci/hda/hda_codec.c
+++ b/sound/pci/hda/hda_codec.c
@@ -1540,7 +1540,8 @@ int snd_hda_check_board_config(struct hda_codec *codec, struct hda_board_config
pci_read_config_word(codec->bus->pci, PCI_SUBSYSTEM_ID, &subsystem_device);
for (c = tbl; c->modelname || c->pci_subvendor; c++) {
if (c->pci_subvendor == subsystem_vendor &&
- c->pci_subdevice == subsystem_device)
+ (! c->pci_subdevice /* all match */||
+ (c->pci_subdevice == subsystem_device)))
return c->config;
}
}