Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=1e02d6ea85e5ca3a8c49a7e2ef1656bfba902fc9
Commit:     1e02d6ea85e5ca3a8c49a7e2ef1656bfba902fc9
Parent:     56162aabb2fb8b9f4a8266feb7eb4edd9d1a4d49
Author:     Clemens Ladisch <[EMAIL PROTECTED]>
AuthorDate: Tue Aug 21 08:58:35 2007 +0200
Committer:  Jaroslav Kysela <[EMAIL PROTECTED]>
CommitDate: Tue Oct 16 15:59:20 2007 +0200

    [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 <[EMAIL PROTECTED]>
    Signed-off-by: Jaroslav Kysela <[EMAIL PROTECTED]>
---
 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;
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to