leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ALSA: ice1724 - Allow card info based on model only

Browse Source 
When two different cards share the same PCI vendor/subvendor
identification, allow card info based on model only.
Do not require subvendor ID.

Signed-off-by: Pavel Hofman <pavel.hofman@ivitera.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Pavel Hofman 2012-01-10 20:28:47 +01:00 committed by Takashi Iwai
parent ffd364ddd3
commit 2b151ef734
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sound/pci/ice1712/ice1724.c
View File

@ -2282,7 +2282,7 @@ static int __devinit snd_vt1724_read_eeprom(struct snd_ice1712 *ice,
} }
} }
for (tbl = card_tables; *tbl; tbl++) { for (tbl = card_tables; *tbl; tbl++) {
for (c = *tbl; c->subvendor; c++) { for (c = *tbl; c->name; c++) {
if (modelname && c->model && if (modelname && c->model &&
!strcmp(modelname, c->model)) { !strcmp(modelname, c->model)) {
printk(KERN_INFO "ice1724: Using board model %s\n", printk(KERN_INFO "ice1724: Using board model %s\n",
@ -2591,8 +2591,10 @@ static int __devinit snd_vt1724_probe(struct pci_dev *pci,
ice->ext_clock_count = 0; ice->ext_clock_count = 0;
for (tbl = card_tables; *tbl; tbl++) { for (tbl = card_tables; *tbl; tbl++) {
for (c = *tbl; c->subvendor; c++) { for (c = *tbl; c->name; c++) {
if (c->subvendor == ice->eeprom.subvendor) { if ((model[dev] && c->model &&
!strcmp(model[dev], c->model)) ||
(c->subvendor == ice->eeprom.subvendor)) {
strcpy(card->shortname, c->name); strcpy(card->shortname, c->name);
if (c->driver) /* specific driver? */ if (c->driver) /* specific driver? */
strcpy(card->driver, c->driver); strcpy(card->driver, c->driver);