소스 검색

[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>
Bjorge Dijkstra 20 년 전
부모
커밋
61be3ce0f2
1개의 변경된 파일1개의 추가작업 그리고 1개의 파일을 삭제
  1. 1 1
      sound/pci/ac97/ac97_codec.c

+ 1 - 1
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;