aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2005-11-17 15:30:43 +0100
committerJaroslav Kysela <perex@suse.cz>2006-01-03 12:20:15 +0100
commit9398441edaf0dc64eca828e3ce7a0326c8640d4c (patch)
tree87d41ad6c4183f242e411557dca3b2f67a364bc5
parent446ab5f5039df4209a2e28752bd48c99007d3d82 (diff)
downloadkernel_goldelico_gta04-9398441edaf0dc64eca828e3ce7a0326c8640d4c.zip
kernel_goldelico_gta04-9398441edaf0dc64eca828e3ce7a0326c8640d4c.tar.gz
kernel_goldelico_gta04-9398441edaf0dc64eca828e3ce7a0326c8640d4c.tar.bz2
[ALSA] ac97-codec - Better ac97_bus name
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>
-rw-r--r--sound/pci/ac97/ac97_codec.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/sound/pci/ac97/ac97_codec.c b/sound/pci/ac97/ac97_codec.c
index bdb6a8c..9faeaef 100644
--- a/sound/pci/ac97/ac97_codec.c
+++ b/sound/pci/ac97/ac97_codec.c
@@ -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;