Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...

[mv-sheeva.git] / sound / pci / ad1889.c

diff --git a/sound/pci/ad1889.c b/sound/pci/ad1889.c
index d42bf4570367cc671c20cee60b6a66bcee779a93..f7aef8c9cf439d1c6678461132476b1330eff782 100644 (file)
--- a/sound/pci/ad1889.c
+++ b/sound/pci/ad1889.c
@@ -947,7 +947,7 @@ snd_ad1889_create(struct snd_card *card,
        spin_lock_init(&chip->lock);    /* only now can we call ad1889_free */
 
        if (request_irq(pci->irq, snd_ad1889_interrupt,
-                       SA_INTERRUPT|SA_SHIRQ, card->driver, (void*)chip)) {
+                       IRQF_DISABLED|IRQF_SHARED, card->driver, (void*)chip)) {
                printk(KERN_ERR PFX "cannot obtain IRQ %d\n", pci->irq);
                snd_ad1889_free(chip);
                return -EBUSY;