diff options
| author | Bjorge Dijkstra <bjorge@gmx.net> | 2005-08-16 11:05:05 -0400 |
|---|---|---|
| committer | Jaroslav Kysela <perex@suse.cz> | 2005-08-30 02:46:34 -0400 |
| commit | 61be3ce0f2d9d80bc271e58c42cb9b021b3d48d8 (patch) | |
| tree | 32d050e4ad8d6de7e03640a901f8878818b104cd /sound | |
| parent | e8da2fbc2dd1fb4d603442f7220d23a2192955fa (diff) | |
[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.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/ac97/ac97_codec.c b/sound/pci/ac97/ac97_codec.c index 600e053dfd35..5501f4440c92 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) | |||
| 1829 | ac97->dev.parent = ac97->bus->card->dev; | 1829 | ac97->dev.parent = ac97->bus->card->dev; |
| 1830 | ac97->dev.platform_data = ac97; | 1830 | ac97->dev.platform_data = ac97; |
| 1831 | ac97->dev.release = ac97_device_release; | 1831 | ac97->dev.release = ac97_device_release; |
| 1832 | strncpy(ac97->dev.bus_id, snd_ac97_get_short_name(ac97), BUS_ID_SIZE); | 1832 | snprintf(ac97->dev.bus_id, BUS_ID_SIZE, "card%d-%d", ac97->bus->card->number, ac97->num); |
| 1833 | if ((err = device_register(&ac97->dev)) < 0) { | 1833 | if ((err = device_register(&ac97->dev)) < 0) { |
| 1834 | snd_printk(KERN_ERR "Can't register ac97 bus\n"); | 1834 | snd_printk(KERN_ERR "Can't register ac97 bus\n"); |
| 1835 | ac97->dev.bus = NULL; | 1835 | ac97->dev.bus = NULL; |