summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorBjorge Dijkstra <bjorge@gmx.net>2005-08-16 17:05:05 +0200
committerJaroslav Kysela <perex@suse.cz>2005-08-30 08:46:34 +0200
commit61be3ce0f2d9d80bc271e58c42cb9b021b3d48d8 (patch)
tree32d050e4ad8d6de7e03640a901f8878818b104cd /sound
parente8da2fbc2dd1fb4d603442f7220d23a2192955fa (diff)
downloadlinux-3.10-61be3ce0f2d9d80bc271e58c42cb9b021b3d48d8.tar.gz
linux-3.10-61be3ce0f2d9d80bc271e58c42cb9b021b3d48d8.tar.bz2
linux-3.10-61be3ce0f2d9d80bc271e58c42cb9b021b3d48d8.zip
[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>
Diffstat (limited to 'sound')
-rw-r--r--sound/pci/ac97/ac97_codec.c2
1 files changed, 1 insertions, 1 deletions
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;