]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
ALSA: aw2 - Fix Oops at initialization
authorTakashi Iwai <tiwai@suse.de>
Mon, 23 Jun 2008 09:54:05 +0000 (11:54 +0200)
committerTakashi Iwai <tiwai@suse.de>
Mon, 23 Jun 2008 10:06:23 +0000 (12:06 +0200)
The irq handler may be called before the proper initialization of hardware.
Call snd_aw2_saa7146_setup() before the irq handler registration.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
sound/pci/aw2/aw2-alsa.c

index 56f87cd33c19fcef9f5afb08bc472042a04a89fa..3f00ddf450f81c287b198cdbdf4c8a17b180c4f8 100644 (file)
@@ -316,6 +316,8 @@ static int __devinit snd_aw2_create(struct snd_card *card,
                return -ENOMEM;
        }
 
+       /* (2) initialization of the chip hardware */
+       snd_aw2_saa7146_setup(&chip->saa7146, chip->iobase_virt);
 
        if (request_irq(pci->irq, snd_aw2_saa7146_interrupt,
                        IRQF_SHARED, "Audiowerk2", chip)) {
@@ -329,8 +331,6 @@ static int __devinit snd_aw2_create(struct snd_card *card,
        }
        chip->irq = pci->irq;
 
-       /* (2) initialization of the chip hardware */
-       snd_aw2_saa7146_setup(&chip->saa7146, chip->iobase_virt);
        err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops);
        if (err < 0) {
                free_irq(chip->irq, (void *)chip);