Merge branch 'topic/jack' into for-linus

[linux-2.6-omap-h63xx.git] / sound / core / jack.c

diff --git a/sound/core/jack.c b/sound/core/jack.c
index 43b10d6e522bc0e7b2c62bee63f0a5d94faa2250..c8254c667c6247cef5e402161b0b1ef076782a5e 100644 (file)
--- a/sound/core/jack.c
+++ b/sound/core/jack.c
@@ -55,7 +55,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. */