1 files changed, 6 insertions, 5 deletions

diff --git a/sound/pci/au88x0/au88x0_mpu401.c b/sound/pci/au88x0/au88x0_mpu401.c
index 873f486b07b8..c75d368ea087 100644
--- a/sound/pci/au88x0/au88x0_mpu401.c
+++ b/sound/pci/au88x0/au88x0_mpu401.c
@@ -47,7 +47,7 @@ static int __devinit snd_vortex_midi(vortex_t * vortex)
         struct snd_rawmidi *rmidi;
         int temp, mode;
         struct snd_mpu401 *mpu;
-        int port;
+        unsigned long port;
 
 #ifdef VORTEX_MPU401_LEGACY
         /* EnableHardCodedMPU401Port() */
@@ -70,9 +70,6 @@ static int __devinit snd_vortex_midi(vortex_t * vortex)
         temp |= (MIDI_CLOCK_DIV << 8) | ((mode >> 24) & 0xff) << 4;
         hwwrite(vortex->mmio, VORTEX_CTRL2, temp);
         hwwrite(vortex->mmio, VORTEX_MIDI_CMD, MPU401_RESET);
-        /* Set some kind of mode */
-        if (mode)
-                hwwrite(vortex->mmio, VORTEX_MIDI_CMD, MPU401_ENTER_UART);
 
         /* Check if anything is OK. */
         temp = hwread(vortex->mmio, VORTEX_MIDI_DATA);
@@ -98,7 +95,8 @@ static int __devinit snd_vortex_midi(vortex_t * vortex)
         port = (unsigned long)(vortex->mmio + VORTEX_MIDI_DATA);
         if ((temp =
              snd_mpu401_uart_new(vortex->card, 0, MPU401_HW_AUREAL, port,
-                                 1, 0, 0, &rmidi)) != 0) {
+                                 MPU401_INFO_INTEGRATED | MPU401_INFO_MMIO,
+                                 0, 0, &rmidi)) != 0) {
                 hwwrite(vortex->mmio, VORTEX_CTRL,
                         (hwread(vortex->mmio, VORTEX_CTRL) &
                          ~CTRL_MIDI_PORT) & ~CTRL_MIDI_EN);
@@ -107,6 +105,9 @@ static int __devinit snd_vortex_midi(vortex_t * vortex)
         mpu = rmidi->private_data;
         mpu->cport = (unsigned long)(vortex->mmio + VORTEX_MIDI_CMD);
 #endif
+        /* Overwrite MIDI name */
+        snprintf(rmidi->name, sizeof(rmidi->name), "%s MIDI %d", CARD_NAME_SHORT , vortex->card->number);
+
         vortex->rmidi = rmidi;
         return 0;
 }