Skip to content

Commit

Permalink
[ALSA] cmipci: fix MIDI device name
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Clemens Ladisch authored and Jaroslav Kysela committed Oct 16, 2007
1 parent 56162aa commit 1e02d6e
Showing 1 changed file with 7 additions and 9 deletions.
16 changes: 7 additions & 9 deletions sound/pci/cmipci.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit 1e02d6e

Please sign in to comment.