This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / sound / core / seq / seq_midi.c

diff --git a/sound/core/seq/seq_midi.c b/sound/core/seq/seq_midi.c
index f61d8bf..202bbea 100644 (file)
--- a/sound/core/seq/seq_midi.c
+++ b/sound/core/seq/seq_midi.c
@@ -279,7 +279,7 @@ static int set_client_name(seq_midisynth_client_t *client, snd_card_t *card,
        cinfo.client = client->seq_client;
        cinfo.type = KERNEL_CLIENT;
        name = rmidi->name[0] ? (const char *)rmidi->name : "External MIDI";
-       strlcpy(cinfo.name, name, sizeof(cinfo.name));
+       snprintf(cinfo.name, sizeof(cinfo.name), "%s - Rawmidi %d", name, card->number);
        return snd_seq_kernel_client_ctl(client->seq_client, SNDRV_SEQ_IOCTL_SET_CLIENT_INFO, &cinfo);
 }
 
@@ -464,9 +464,7 @@ static int __init alsa_seq_midi_init(void)
                snd_seq_midisynth_unregister_port,
        };
        memset(&synths, 0, sizeof(synths));
-       snd_seq_autoload_lock();
        snd_seq_device_register_driver(SNDRV_SEQ_DEV_ID_MIDISYNTH, &ops, 0);
-       snd_seq_autoload_unlock();
        return 0;
 }