Merge branch 'viro'

[linux-2.6] / sound / oss / i810_audio.c

diff --git a/sound/oss/i810_audio.c b/sound/oss/i810_audio.c
index b9a640fe48b10c857867a6c86854a78fee0a73fc..abc242abd5b111ba5dea82c2d51889a26a9a45b6 100644 (file)
--- a/sound/oss/i810_audio.c
+++ b/sound/oss/i810_audio.c
@@ -312,7 +312,8 @@ static struct pci_device_id i810_pci_tbl [] = {
         PCI_ANY_ID, PCI_ANY_ID, 0, 0, INTELICH4},
        {PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH6_18,
         PCI_ANY_ID, PCI_ANY_ID, 0, 0, INTELICH4},
-
+       {PCI_VENDOR_ID_NVIDIA,  PCI_DEVICE_ID_NVIDIA_CK804_AUDIO,
+        PCI_ANY_ID, PCI_ANY_ID, 0, 0, NVIDIA_NFORCE},
        {0,}
 };
 
@@ -3359,12 +3360,6 @@ static int __devinit i810_probe(struct pci_dev *pci_dev, const struct pci_device
                goto out_region2;
        }
 
-       if (request_irq(card->irq, &i810_interrupt, SA_SHIRQ,
-                       card_names[pci_id->driver_data], card)) {
-               printk(KERN_ERR "i810_audio: unable to allocate irq %d\n", card->irq);
-               goto out_pio;
-       }
-
        if (card->use_mmio) {
                if (request_mem_region(card->ac97base_mmio_phys, 512, "ich_audio MMBAR")) {
                        if ((card->ac97base_mmio = ioremap(card->ac97base_mmio_phys, 512))) { /*@FIXME can ioremap fail? don't know (jsaw) */
@@ -3395,10 +3390,8 @@ static int __devinit i810_probe(struct pci_dev *pci_dev, const struct pci_device
        }
 
        /* initialize AC97 codec and register /dev/mixer */
-       if (i810_ac97_init(card) <= 0) {
-               free_irq(card->irq, card);
+       if (i810_ac97_init(card) <= 0)
                goto out_iospace;
-       }
        pci_set_drvdata(pci_dev, card);
 
        if(clocking == 0) {
@@ -3410,7 +3403,6 @@ static int __devinit i810_probe(struct pci_dev *pci_dev, const struct pci_device
        if ((card->dev_audio = register_sound_dsp(&i810_audio_fops, -1)) < 0) {
                int i;
                printk(KERN_ERR "i810_audio: couldn't register DSP device!\n");
-               free_irq(card->irq, card);
                for (i = 0; i < NR_AC97; i++)
                if (card->ac97_codec[i] != NULL) {
                        unregister_sound_mixer(card->ac97_codec[i]->dev_mixer);
@@ -3419,6 +3411,13 @@ static int __devinit i810_probe(struct pci_dev *pci_dev, const struct pci_device
                goto out_iospace;
        }
 
+       if (request_irq(card->irq, &i810_interrupt, SA_SHIRQ,
+                       card_names[pci_id->driver_data], card)) {
+               printk(KERN_ERR "i810_audio: unable to allocate irq %d\n", card->irq);
+               goto out_iospace;
+       }
+
+
        card->initializing = 0;
        return 0;
 
@@ -3429,7 +3428,6 @@ out_iospace:
                release_mem_region(card->ac97base_mmio_phys, 512);
                release_mem_region(card->iobase_mmio_phys, 256);
        }
-out_pio:       
        release_region(card->ac97base, 256);
 out_region2:
        release_region(card->iobase, 64);