]> err.no Git - linux-2.6/commitdiff
[ALSA] ac97-codec - Better ac97_bus name
authorTakashi Iwai <tiwai@suse.de>
Thu, 17 Nov 2005 14:30:43 +0000 (15:30 +0100)
committerJaroslav Kysela <perex@suse.cz>
Tue, 3 Jan 2006 11:20:15 +0000 (12:20 +0100)
Modules: AC97 Codec

Generate a better name string for ac97_bus sysfs interface including
the name of ac97 codec chip.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
sound/pci/ac97/ac97_codec.c

index bdb6a8cc0ae6137d8bce603f5df91a4365a30394..9faeaefc8e6e4c0318312d8afc3fefa4b930aa7a 100644 (file)
@@ -137,7 +137,7 @@ static const struct ac97_codec_id snd_ac97_codec_ids[] = {
 { 0x43585421, 0xffffffff, "HSD11246",          NULL,           NULL }, // SmartMC II
 { 0x43585428, 0xfffffff8, "Cx20468",           patch_conexant, NULL }, // SmartAMC fixme: the mask might be different
 { 0x44543031, 0xfffffff0, "DT0398",            NULL,           NULL },
-{ 0x454d4328, 0xffffffff, "28028",             NULL,           NULL },  // same as TR28028?
+{ 0x454d4328, 0xffffffff, "EM28028",           NULL,           NULL },  // same as TR28028?
 { 0x45838308, 0xffffffff, "ESS1988",           NULL,           NULL },
 { 0x48525300, 0xffffff00, "HMP9701",           NULL,           NULL },
 { 0x49434501, 0xffffffff, "ICE1230",           NULL,           NULL },
@@ -1816,7 +1816,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, "card%d-%d", ac97->bus->card->number, ac97->num);
+       snprintf(ac97->dev.bus_id, BUS_ID_SIZE, "%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;