Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2b151ef7 authored by Pavel Hofman's avatar Pavel Hofman Committed by Takashi Iwai
Browse files

ALSA: ice1724 - Allow card info based on model only 



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: default avatarPavel Hofman <pavel.hofman@ivitera.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent ffd364dd

sound/pci/ice1712/ice1724.c

+5 −3
Original line number Diff line number Diff line
@@ -2282,7 +2282,7 @@ static int __devinit snd_vt1724_read_eeprom(struct snd_ice1712 *ice, 
		}

	}

	for (tbl = card_tables; *tbl; tbl++) {

		for (c = *tbl; c->subvendor; c++) {

		for (c = *tbl; c->name; c++) {

			if (modelname && c->model &&

			    !strcmp(modelname, c->model)) {

				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;



	for (tbl = card_tables; *tbl; tbl++) {

		for (c = *tbl; c->subvendor; c++) {

			if (c->subvendor == ice->eeprom.subvendor) {

		for (c = *tbl; c->name; c++) {

			if ((model[dev] && c->model &&

			     !strcmp(model[dev], c->model)) ||

			    (c->subvendor == ice->eeprom.subvendor)) {

				strcpy(card->shortname, c->name);

				if (c->driver) /* specific driver? */

					strcpy(card->driver, c->driver);