From: Bjorge Dijkstra <bjorge@gmx.net>
Date: Tue, 16 Aug 2005 15:05:05 +0000 (+0200)
Subject: [ALSA] ac97 - make ac97 codec device name unique
X-Git-Tag: v2.6.14-rc1~1029^2~24
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=61be3ce0f2d9d80bc271e58c42cb9b021b3d48d8;p=linux-2.6-omap-h63xx.git

[ALSA] ac97 - make ac97 codec device name unique

AC97 Codec
The patch fixes the bus_id conflict error when registering two codecs
of the same type (ALSA bug#1334).

Signed-off-by: Bjorge Dijkstra <bjorge@gmx.net>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
---

diff --git a/sound/pci/ac97/ac97_codec.c b/sound/pci/ac97/ac97_codec.c
index 600e053dfd3..5501f4440c9 100644
--- a/sound/pci/ac97/ac97_codec.c
+++ b/sound/pci/ac97/ac97_codec.c
@@ -1829,7 +1829,7 @@ static int snd_ac97_dev_register(snd_device_t *device)
 	ac97->dev.parent = ac97->bus->card->dev;
 	ac97->dev.platform_data = ac97;
 	ac97->dev.release = ac97_device_release;
-	strncpy(ac97->dev.bus_id, snd_ac97_get_short_name(ac97), BUS_ID_SIZE);
+	snprintf(ac97->dev.bus_id, BUS_ID_SIZE, "card%d-%d", ac97->bus->card->number, ac97->num);
 	if ((err = device_register(&ac97->dev)) < 0) {
 		snd_printk(KERN_ERR "Can't register ac97 bus\n");
 		ac97->dev.bus = NULL;