summaryrefslogtreecommitdiffstats
path: root/drivers/media/pci
diff options
context:
space:
mode:
authorMichael Opdenacker <michael.opdenacker@free-electrons.com>2013-10-13 02:37:35 -0300
committerMauro Carvalho Chehab <m.chehab@samsung.com>2013-10-17 06:08:08 -0300
commit9a373d17cc4555322a9044e5ca1ba8744ce273dd (patch)
treebc2326415317b655cc0b934e949581e30510c25f /drivers/media/pci
parent68b3869ee9290d12af73bb8d2ed7a06988480a37 (diff)
downloadop-kernel-dev-9a373d17cc4555322a9044e5ca1ba8744ce273dd.zip
op-kernel-dev-9a373d17cc4555322a9044e5ca1ba8744ce273dd.tar.gz
[media] cx18: remove deprecated IRQF_DISABLED
This patch proposes to remove the use of the IRQF_DISABLED flag It's a NOOP since 2.6.35 and it will be removed one day. Signed-off-by: Michael Opdenacker <michael.opdenacker@free-electrons.com> Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Diffstat (limited to 'drivers/media/pci')
-rw-r--r--drivers/media/pci/cx18/cx18-driver.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/media/pci/cx18/cx18-driver.c b/drivers/media/pci/cx18/cx18-driver.c
index 004d8ac..ff72320 100644
--- a/drivers/media/pci/cx18/cx18-driver.c
+++ b/drivers/media/pci/cx18/cx18-driver.c
@@ -1031,8 +1031,7 @@ static int cx18_probe(struct pci_dev *pci_dev,
/* Register IRQ */
retval = request_irq(cx->pci_dev->irq, cx18_irq_handler,
- IRQF_SHARED | IRQF_DISABLED,
- cx->v4l2_dev.name, (void *)cx);
+ IRQF_SHARED, cx->v4l2_dev.name, (void *)cx);
if (retval) {
CX18_ERR("Failed to register irq %d\n", retval);
goto free_i2c;
OpenPOWER on IntegriCloud