---

yaml --- r: 179523 b: refs/heads/master c: 13d5036 h: refs/heads/master i: 179521: 12057ba 179519: 239df12 v: v3
git-mirror · Jan 17, 2010 · fddd62b · fddd62b
1 parent 7023e41
commit fddd62b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ff63ac56705539e162d2f020a0c2a607eae37d7b
+refs/heads/master: 13d5036ea0636e6204e1b17bd12ea25061a686be
diff --git a/trunk/drivers/media/dvb/mantis/mantis_pci.c b/trunk/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;