[ALSA] cmipci: fix MIDI device name
Clemens Ladisch [Tue, 21 Aug 2007 06:58:35 +0000 (08:58 +0200)]
Initialize card->shortname early enough so that the MIDI device can pick
it up and does not need to have a generic name.

Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>

sound/pci/cmipci.c

index f38054e..c42c516 100644 (file)
@@ -2923,6 +2923,13 @@ static int __devinit snd_cmipci_create(struct snd_card *card, struct pci_dev *pc
                break;
        }
 
+       sprintf(card->shortname, "C-Media PCI %s", card->driver);
+       sprintf(card->longname, "%s (model %d) at 0x%lx, irq %i",
+               card->shortname,
+               cm->chip_version,
+               cm->iobase,
+               cm->irq);
+
        if ((err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, cm, &ops)) < 0) {
                snd_cmipci_free(cm);
                return err;
@@ -3049,15 +3056,6 @@ static int __devinit snd_cmipci_probe(struct pci_dev *pci,
        }
        card->private_data = cm;
 
-       sprintf(card->shortname, "C-Media PCI %s", card->driver);
-       sprintf(card->longname, "%s (model %d) at 0x%lx, irq %i",
-               card->shortname,
-               cm->chip_version,
-               cm->iobase,
-               cm->irq);
-
-       //snd_printd("%s is detected\n", card->longname);
-
        if ((err = snd_card_register(card)) < 0) {
                snd_card_free(card);
                return err;