diff options
| author | Clemens Ladisch <clemens@ladisch.de> | 2007-08-21 08:58:35 +0200 |
|---|---|---|
| committer | Jaroslav Kysela <perex@perex.cz> | 2007-10-16 15:59:20 +0200 |
| commit | 1e02d6ea85e5ca3a8c49a7e2ef1656bfba902fc9 (patch) | |
| tree | 8ac3bfe76293f5300cdb103b77911d0e9aacd162 /sound/pci/cmipci.c | |
| parent | 56162aabb2fb8b9f4a8266feb7eb4edd9d1a4d49 (diff) | |
| download | op-kernel-dev-1e02d6ea85e5ca3a8c49a7e2ef1656bfba902fc9.zip op-kernel-dev-1e02d6ea85e5ca3a8c49a7e2ef1656bfba902fc9.tar.gz | |
[ALSA] cmipci: fix MIDI device name
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>
Diffstat (limited to 'sound/pci/cmipci.c')
| -rw-r--r-- | sound/pci/cmipci.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/sound/pci/cmipci.c b/sound/pci/cmipci.c index f38054e..c42c516 100644 --- a/sound/pci/cmipci.c +++ b/sound/pci/cmipci.c @@ -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; |
