From ac86840f0591c07b2c3f823bdf80fdc2a536b964 Mon Sep 17 00:00:00 2001
From: Alan Horstmann <gineera@aspect135.co.uk>
Date: Wed, 3 May 2006 17:07:29 +0200
Subject: [PATCH] --- yaml --- r: 28494 b: refs/heads/master c:
 520290e43f9880da34e542185838816c6d79a340 h: refs/heads/master v: v3

---
 [refs]                                 |  2 +-
 trunk/sound/pci/au88x0/au88x0.c        | 12 +++++++-----
 trunk/sound/pci/au88x0/au88x0_mpu401.c |  3 +++
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 5ba0922c66a6..a616a476614c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a59524faf3a2050e14a1c9038eb006ce96025394
+refs/heads/master: 520290e43f9880da34e542185838816c6d79a340
diff --git a/trunk/sound/pci/au88x0/au88x0.c b/trunk/sound/pci/au88x0/au88x0.c
index 126870ec063a..8a3b118989bf 100644
--- a/trunk/sound/pci/au88x0/au88x0.c
+++ b/trunk/sound/pci/au88x0/au88x0.c
@@ -261,6 +261,13 @@ snd_vortex_probe(struct pci_dev *pci, const struct pci_device_id *pci_id)
 		return err;
 	}
 	snd_vortex_workaround(pci, pcifix[dev]);
+
+	// Card details needed in snd_vortex_midi
+	strcpy(card->driver, CARD_NAME_SHORT);
+	sprintf(card->shortname, "Aureal Vortex %s", CARD_NAME_SHORT);
+	sprintf(card->longname, "%s at 0x%lx irq %i",
+		card->shortname, chip->io, chip->irq);
+
 	// (4) Alloc components.
 	// ADB pcm.
 	if ((err = snd_vortex_new_pcm(chip, VORTEX_PCM_ADB, NR_ADB)) < 0) {
@@ -323,11 +330,6 @@ snd_vortex_probe(struct pci_dev *pci, const struct pci_device_id *pci_id)
 #endif
 
 	// (5)
-	strcpy(card->driver, CARD_NAME_SHORT);
-	strcpy(card->shortname, CARD_NAME_SHORT);
-	sprintf(card->longname, "%s at 0x%lx irq %i",
-		card->shortname, chip->io, chip->irq);
-
 	if ((err = pci_read_config_word(pci, PCI_DEVICE_ID,
 				  &(chip->device))) < 0) {
 		snd_card_free(card);
diff --git a/trunk/sound/pci/au88x0/au88x0_mpu401.c b/trunk/sound/pci/au88x0/au88x0_mpu401.c
index 873f486b07b8..814bc2db9f0c 100644
--- a/trunk/sound/pci/au88x0/au88x0_mpu401.c
+++ b/trunk/sound/pci/au88x0/au88x0_mpu401.c
@@ -107,6 +107,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;
 }