]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
ALSA: jack - Use card->shortname for input name
authorTakashi Iwai <tiwai@suse.de>
Wed, 18 Feb 2009 15:46:27 +0000 (16:46 +0100)
committerTakashi Iwai <tiwai@suse.de>
Wed, 18 Feb 2009 15:46:27 +0000 (16:46 +0100)
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>
sound/core/jack.c

index dd4a12dc09aa44f4c50c5b60f2cf5584c5635589..077a85262c1c2592c8323b6f249fc645aaf5ecc7 100644 (file)
@@ -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. */