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
/
saa7134
/
saa7134-core.c
diff --git
a/drivers/media/pci/saa7134/saa7134-core.c
b/drivers/media/pci/saa7134/saa7134-core.c
index 45f0aca597ae4c4938feaa6b18cd38d6d0abe8ca..27d7ee709c5895ddd29eb956992c6a9ebc97bff9 100644
(file)
--- a/
drivers/media/pci/saa7134/saa7134-core.c
+++ b/
drivers/media/pci/saa7134/saa7134-core.c
@@
-992,7
+992,7
@@
static int saa7134_initdev(struct pci_dev *pci_dev,
/* get irq */
err = request_irq(pci_dev->irq, saa7134_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);