From 5fc94c0259010fc1c41b38e80b3c4b8b9ff7ec31 Mon Sep 17 00:00:00 2001 From: Bjorge Dijkstra Date: Tue, 16 Aug 2005 17:05:05 +0200 Subject: [PATCH] --- yaml --- r: 6549 b: refs/heads/master c: 61be3ce0f2d9d80bc271e58c42cb9b021b3d48d8 h: refs/heads/master i: 6547: 9c8038c10ada015183b3e44ef1befb49281ec077 v: v3 --- [refs] | 2 +- trunk/sound/pci/ac97/ac97_codec.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index edc4b6737015..fd46aa1f2a42 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e8da2fbc2dd1fb4d603442f7220d23a2192955fa +refs/heads/master: 61be3ce0f2d9d80bc271e58c42cb9b021b3d48d8 diff --git a/trunk/sound/pci/ac97/ac97_codec.c b/trunk/sound/pci/ac97/ac97_codec.c index 600e053dfd35..5501f4440c92 100644 --- a/trunk/sound/pci/ac97/ac97_codec.c +++ b/trunk/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;