diff options
| author | H. Peter Anvin <hpa@linux.intel.com> | 2009-02-23 17:05:56 -0500 |
|---|---|---|
| committer | H. Peter Anvin <hpa@linux.intel.com> | 2009-02-23 17:05:56 -0500 |
| commit | dc731ca60954310be0993e8992d450c7089fd13d (patch) | |
| tree | 6a997916f963d9e6dfa76fc5564296f57c3f909e /sound/core/jack.c | |
| parent | ec5b3d32437571b8a742069a4cfd04edb6b6eda5 (diff) | |
| parent | 20f4d6c3a2a23c5d7d9cc7f42fbb943ca7a03d1f (diff) | |
Merge branch 'x86/urgent' into x86/mce2
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) | |||
| 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. */ |