projects
/
linux-drm-fsl-dcu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck...
[linux-drm-fsl-dcu.git]
/
drivers
/
media
/
pci
/
cx23885
/
cx23885-core.c
diff --git
a/drivers/media/pci/cx23885/cx23885-core.c
b/drivers/media/pci/cx23885/cx23885-core.c
index 9f63d93239ec9d279f1de77952e6459ee40389fc..edcd79db1e4ebc5d8ba6319b2ccb3c900a3024b4 100644
(file)
--- a/
drivers/media/pci/cx23885/cx23885-core.c
+++ b/
drivers/media/pci/cx23885/cx23885-core.c
@@
-2129,7
+2129,7
@@
static int cx23885_initdev(struct pci_dev *pci_dev,
}
err = request_irq(pci_dev->irq, cx23885_irq,
- IRQF_SHARED
| IRQF_DISABLED
, dev->name, dev);
+ IRQF_SHARED, dev->name, dev);
if (err < 0) {
printk(KERN_ERR "%s: can't get IRQ %d\n",
dev->name, pci_dev->irq);