diff options
author | Manu Abraham <abraham.manu@gmail.com> | 2009-12-04 03:33:10 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-01-17 08:55:41 -0500 |
commit | 13d5036ea0636e6204e1b17bd12ea25061a686be (patch) | |
tree | affa28aeef60d70372ab919fee9fe9fe32eda7cf /drivers/media | |
parent | ff63ac56705539e162d2f020a0c2a607eae37d7b (diff) |
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.c | 7 |
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 d3a62b18590e..94abcee3fc72 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, | |||
181 | // Clear and disable all interrupts at startup | 181 | // Clear and disable all interrupts at startup |
182 | // to avoid lockup situations | 182 | // to avoid lockup situations |
183 | mmwrite(0x00, MANTIS_INT_MASK); | 183 | mmwrite(0x00, MANTIS_INT_MASK); |
184 | if (request_irq(pdev->irq, mantis_pci_irq, IRQF_SHARED | IRQF_DISABLED, | 184 | if (request_irq(pdev->irq, |
185 | DRIVER_NAME, mantis) < 0) { | 185 | mantis_pci_irq, |
186 | IRQF_SHARED, | ||
187 | DRIVER_NAME, | ||
188 | mantis) < 0) { | ||
186 | 189 | ||
187 | dprintk(verbose, MANTIS_ERROR, 1, "Mantis IRQ reg failed"); | 190 | dprintk(verbose, MANTIS_ERROR, 1, "Mantis IRQ reg failed"); |
188 | ret = -ENODEV; | 191 | ret = -ENODEV; |