aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorAlan Horstmann <gineera@aspect135.co.uk>2006-04-21 08:39:20 +0200
committerJaroslav Kysela <perex@suse.cz>2006-06-22 21:32:46 +0200
commit78fc030bdbbeebdea436f2b02a616d67e5f9bd9b (patch)
tree1c2264a565bc9f71a2cfdfffafe8cce38082c47c /sound
parent887709be9063d233eb5abef25aafcd94615b03f9 (diff)
downloadkernel_samsung_aries-78fc030bdbbeebdea436f2b02a616d67e5f9bd9b.zip
kernel_samsung_aries-78fc030bdbbeebdea436f2b02a616d67e5f9bd9b.tar.gz
kernel_samsung_aries-78fc030bdbbeebdea436f2b02a616d67e5f9bd9b.tar.bz2
[ALSA] Change seq_midi.c so client name is card, rather than port, specific
Change snd_seq_midisynth_register_port() in seq_midi.c so that if a new client is created, the client name string is based on card->shortname not (port-specific) info->name. Signed-off-by: Alan Horstmann <gineera@aspect135.co.uk> Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Diffstat (limited to 'sound')
-rw-r--r--sound/core/seq/seq_midi.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/core/seq/seq_midi.c b/sound/core/seq/seq_midi.c
index 9caa137..3b316da 100644
--- a/sound/core/seq/seq_midi.c
+++ b/sound/core/seq/seq_midi.c
@@ -320,8 +320,8 @@ snd_seq_midisynth_register_port(struct snd_seq_device *dev)
}
client->seq_client =
snd_seq_create_kernel_client(
- card, 0, "%s", info->name[0] ?
- (const char *)info->name : "External MIDI");
+ card, 0, "%s", card->shortname[0] ?
+ (const char *)card->shortname : "External MIDI");
if (client->seq_client < 0) {
kfree(client);
mutex_unlock(&register_mutex);