diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-24 23:52:27 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-24 23:52:27 +0300 |
| commit | 87b203079ed949de52f0d92aeae20e5e0116c12f (patch) | |
| tree | 1878756f936963822ed2d51a15db1da5814973e7 /sound/core/jack.c | |
| parent | 58105ef1857112a186696c9b8957020090226a28 (diff) | |
| parent | a852cbfaaf8122827602027b1614971cfd832304 (diff) | |
| download | linux-87b203079ed949de52f0d92aeae20e5e0116c12f.tar.xz | |
Merge branch 'x86/core' into core/percpu
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. */ |