diff options
| author | James Morris <jmorris@namei.org> | 2009-03-23 19:52:46 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2009-03-23 19:52:46 -0400 |
| commit | 703a3cd72817e99201cef84a8a7aecc60b2b3581 (patch) | |
| tree | 3e943755178ff410694722bb031f523136fbc432 /sound/core/jack.c | |
| parent | df7f54c012b92ec93d56b68547351dcdf8a163d3 (diff) | |
| parent | 8e0ee43bc2c3e19db56a4adaa9a9b04ce885cd84 (diff) | |
Merge branch 'master' into next
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 dd4a12dc09a..077a85262c1 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) | |||
| 47 | int err; | 47 | int err; |
| 48 | 48 | ||
| 49 | snprintf(jack->name, sizeof(jack->name), "%s %s", | 49 | snprintf(jack->name, sizeof(jack->name), "%s %s", |
| 50 | card->longname, jack->id); | 50 | card->shortname, jack->id); |
| 51 | jack->input_dev->name = jack->name; | 51 | jack->input_dev->name = jack->name; |
| 52 | 52 | ||
| 53 | /* Default to the sound card device. */ | 53 | /* Default to the sound card device. */ |