From: Takashi Iwai <tiwai@suse.de>
Date: Wed, 30 Mar 2005 12:40:25 +0000 (+0200)
Subject: [ALSA] Fix the default id of multiple cards
X-Git-Tag: v2.6.13-rc1~68^2~717
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=85a655d66b4d1672c7c6fee31297837556585f6b;p=linux-2.6

[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: Takashi Iwai <tiwai@suse.de>
---

diff --git a/sound/pci/emu10k1/emu10k1_main.c b/sound/pci/emu10k1/emu10k1_main.c
index a2fa5012c8..c51a8ae464 100644
--- a/sound/pci/emu10k1/emu10k1_main.c
+++ b/sound/pci/emu10k1/emu10k1_main.c
@@ -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;