diff options
author | Alan Horstmann <gineera@aspect135.co.uk> | 2006-05-03 11:07:29 -0400 |
---|---|---|
committer | Jaroslav Kysela <perex@suse.cz> | 2006-06-22 15:33:26 -0400 |
commit | 520290e43f9880da34e542185838816c6d79a340 (patch) | |
tree | bf98333a95a459ea41dbe05b5d56785061ae3525 /sound/pci/au88x0/au88x0_mpu401.c | |
parent | a59524faf3a2050e14a1c9038eb006ce96025394 (diff) |
[ALSA] au88x0 - Init before create components
Change the order in vortex_probe to set the card details before creating the
components, meaning for example that card->shortname is available when
registering the midi port.
I have also added extra to card->shortname, and a line to overwrite the midi
name following snd_mpu401_uart_new.
Signed-off-by: Alan Horstmann <gineera@aspect135.co.uk>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/au88x0/au88x0_mpu401.c')
-rw-r--r-- | sound/pci/au88x0/au88x0_mpu401.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sound/pci/au88x0/au88x0_mpu401.c b/sound/pci/au88x0/au88x0_mpu401.c index 873f486b07b8..814bc2db9f0c 100644 --- a/sound/pci/au88x0/au88x0_mpu401.c +++ b/sound/pci/au88x0/au88x0_mpu401.c | |||
@@ -107,6 +107,9 @@ static int __devinit snd_vortex_midi(vortex_t * vortex) | |||
107 | mpu = rmidi->private_data; | 107 | mpu = rmidi->private_data; |
108 | mpu->cport = (unsigned long)(vortex->mmio + VORTEX_MIDI_CMD); | 108 | mpu->cport = (unsigned long)(vortex->mmio + VORTEX_MIDI_CMD); |
109 | #endif | 109 | #endif |
110 | /* Overwrite MIDI name */ | ||
111 | snprintf(rmidi->name, sizeof(rmidi->name), "%s MIDI %d", CARD_NAME_SHORT , vortex->card->number); | ||
112 | |||
110 | vortex->rmidi = rmidi; | 113 | vortex->rmidi = rmidi; |
111 | return 0; | 114 | return 0; |
112 | } | 115 | } |