V4L/DVB (13785): [Mantis] Do not disable IRQ's while being invoked
authorManu Abraham <abraham.manu@gmail.com>
Fri, 4 Dec 2009 08:33:10 +0000 (05:33 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Sun, 17 Jan 2010 13:55:41 +0000 (11:55 -0200)
Signed-off-by: Manu Abraham <manu@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
drivers/media/dvb/mantis/mantis_pci.c

index d3a62b18590ebeabf8ac1d47cc2f88bc5d159bfa..94abcee3fc72eea0423ed646091276791352842e 100644 (file)
@@ -181,8 +181,11 @@ static int __devinit mantis_pci_probe(struct pci_dev *pdev,
        // Clear and disable all interrupts at startup
        // to avoid lockup situations
        mmwrite(0x00, MANTIS_INT_MASK);
-       if (request_irq(pdev->irq, mantis_pci_irq, IRQF_SHARED | IRQF_DISABLED,
-                                               DRIVER_NAME, mantis) < 0) {
+       if (request_irq(pdev->irq,
+                       mantis_pci_irq,
+                       IRQF_SHARED,
+                       DRIVER_NAME,
+                       mantis) < 0) {
 
                dprintk(verbose, MANTIS_ERROR, 1, "Mantis IRQ reg failed");
                ret = -ENODEV;