V4L/DVB (13785): [Mantis] Do not disable IRQ's while being invoked

[safe/jmp/linux-2.6] / drivers / media / dvb / mantis / mantis_pci.c

diff --git a/drivers/media/dvb/mantis/mantis_pci.c b/drivers/media/dvb/mantis/mantis_pci.c
index d3a62b1..94abcee 100644 (file)
--- a/drivers/media/dvb/mantis/mantis_pci.c
+++ b/drivers/media/dvb/mantis/mantis_pci.c
@@ -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;