diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-02-19 13:58:01 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-02-19 13:58:01 +0100 |
| commit | e6845d9101c5ad2b132473d515e77d74415f004b (patch) | |
| tree | a82dbffd99c7bd4990f10e2b61164aba453cf7eb /sound/core/jack.c | |
| parent | 379752fdf8d2e2be2e7da84300bbf73e4f78c36f (diff) | |
| parent | 6ce6c473a7fd742fdb0db95841e2c4c6b37337c5 (diff) | |
| download | linux-e6845d9101c5ad2b132473d515e77d74415f004b.tar.gz | |
Merge branch 'fix/misc' into for-linus
Diffstat (limited to 'sound/core/jack.c')
| -rw-r--r-- | sound/core/jack.c | 2 |
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. */ |