summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2009-02-18 18:46:27 +0300
committerTakashi Iwai <tiwai@suse.de>2009-02-18 18:46:27 +0300
commit2678f60d2bc05a12580b93eb36f089f0e55693e0 (patch)
tree16267723e509b204f36002bb8f4a09f0142738ee /sound
parentd2f8d7ee1a9b4650b4e43325b321801264f7c37a (diff)
downloadlinux-2678f60d2bc05a12580b93eb36f089f0e55693e0.tar.xz
ALSA: jack - Use card->shortname for input name
Currently the jack layer refers to card->longname as a part of its input device name string. However, longname is often really long and way too ugly as an identifier, such as, "HDA Intel at 0xf8400000 irq 21". This patch changes the code to use card->shortname instead. The shortname string contains usually the h/w vendor and product names but without messy I/O port or IRQ numbers. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
-rw-r--r--sound/core/jack.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/core/jack.c b/sound/core/jack.c
index dd4a12dc09aa..077a85262c1c 100644
--- a/sound/core/jack.c
+++ b/sound/core/jack.c
@@ -47,7 +47,7 @@ static int snd_jack_dev_register(struct snd_device *device)
int err;
snprintf(jack->name, sizeof(jack->name), "%s %s",
- card->longname, jack->id);
+ card->shortname, jack->id);
jack->input_dev->name = jack->name;
/* Default to the sound card device. */