diff options
| author | Takashi Iwai <tiwai@suse.de> | 2008-11-07 09:06:05 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2008-11-07 09:06:05 +0100 |
| commit | 63cf123bf5d538a066e4a899390c9ce56ab6df9f (patch) | |
| tree | 00a5e6eabcfdd310247018188f8ebe35b8b6f1ba /sound/pci/ac97 | |
| parent | 6834d7ce224a6f6a1dd05da3a867730c40943154 (diff) | |
| parent | fcef7836a31c6432b41a38867d413ed3d6aa8261 (diff) | |
| download | linux-63cf123bf5d538a066e4a899390c9ce56ab6df9f.tar.bz2 | |
Merge branch 'topic/fix/misc' into topic/misc
Diffstat (limited to 'sound/pci/ac97')
| -rw-r--r-- | sound/pci/ac97/ac97_codec.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/pci/ac97/ac97_codec.c b/sound/pci/ac97/ac97_codec.c index 6704acbca8c0..bd510eceff1f 100644 --- a/sound/pci/ac97/ac97_codec.c +++ b/sound/pci/ac97/ac97_codec.c @@ -1927,9 +1927,9 @@ static int snd_ac97_dev_register(struct snd_device *device) ac97->dev.bus = &ac97_bus_type; ac97->dev.parent = ac97->bus->card->dev; ac97->dev.release = ac97_device_release; - snprintf(ac97->dev.bus_id, BUS_ID_SIZE, "%d-%d:%s", - ac97->bus->card->number, ac97->num, - snd_ac97_get_short_name(ac97)); + dev_set_name(&ac97->dev, "%d-%d:%s", + ac97->bus->card->number, ac97->num, + snd_ac97_get_short_name(ac97)); if ((err = device_register(&ac97->dev)) < 0) { snd_printk(KERN_ERR "Can't register ac97 bus\n"); ac97->dev.bus = NULL; |