Commit 85a655d6 authored by Takashi Iwai's avatar Takashi Iwai Committed by Jaroslav Kysela
Browse files

[ALSA] Fix the default id of multiple cards 



EMU10K1/EMU10K2 driver
Fixed the default id string in case identical multiple cards exist.

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent aec72e0a

sound/pci/emu10k1/emu10k1_main.c

+15 −1
Original line number Diff line number Diff line
@@ -787,8 +787,22 @@ int __devinit snd_emu10k1_create(snd_card_t * card, 
	else

		snd_printdd("Sound card name=%s, vendor=0x%x, device=0x%x, subsystem=0x%x\n", c->name, pci->vendor, pci->device, emu->serial);

	

	if (!*card->id && c->id)

	if (!*card->id && c->id) {

		int i, n = 0;

		strlcpy(card->id, c->id, sizeof(card->id));

		for (;;) {

			for (i = 0; i < snd_ecards_limit; i++) {

				if (snd_cards[i] && !strcmp(snd_cards[i]->id, card->id))

					break;

			}

			if (i >= snd_ecards_limit)

				break;

			n++;

			if (n >= SNDRV_CARDS)

				break;

			snprintf(card->id, sizeof(card->id), "%s_%d", c->id, n);

		}

	}



	is_audigy = emu->audigy = c->emu10k2_chip;