From fddd62b5d5c8ccda4c3f0a99379f8fcf72f65d1d Mon Sep 17 00:00:00 2001 From: Manu Abraham Date: Fri, 4 Dec 2009 05:33:10 -0300 Subject: [PATCH] --- yaml --- r: 179523 b: refs/heads/master c: 13d5036ea0636e6204e1b17bd12ea25061a686be h: refs/heads/master i: 179521: 12057bad60c607c00ac2fd3ffde8abca50ba1f29 179519: 239df12acfe0d34e417123ab78567ed8ad0dc7c8 v: v3 --- [refs] | 2 +- trunk/drivers/media/dvb/mantis/mantis_pci.c | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 3bb74f72c996..f79a23a96488 100644 --- 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 index d3a62b18590e..94abcee3fc72 100644 --- 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;