summaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorManu Abraham <abraham.manu@gmail.com>2009-12-04 05:33:10 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-01-17 11:55:41 -0200
commit13d5036ea0636e6204e1b17bd12ea25061a686be (patch)
treeaffa28aeef60d70372ab919fee9fe9fe32eda7cf /drivers/media
parentff63ac56705539e162d2f020a0c2a607eae37d7b (diff)
downloadop-kernel-dev-13d5036ea0636e6204e1b17bd12ea25061a686be.zip
op-kernel-dev-13d5036ea0636e6204e1b17bd12ea25061a686be.tar.gz
V4L/DVB (13785): [Mantis] Do not disable IRQ's while being invoked
Signed-off-by: Manu Abraham <manu@linuxtv.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/dvb/mantis/mantis_pci.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/media/dvb/mantis/mantis_pci.c b/drivers/media/dvb/mantis/mantis_pci.c
index d3a62b1..94abcee 100644
--- 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;
OpenPOWER on IntegriCloud