diff options
author | Tony Lindgren <tony@atomide.com> | 2013-11-25 15:30:10 -0800 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2013-11-25 15:30:10 -0800 |
commit | f19f8d8ebc0b392c01082e0feb44ec152cc47a30 (patch) | |
tree | f45f5391e97e29d5ef0003fc90f34bf0e18ba20f /drivers/media/pci/bt8xx/bttv-driver.c | |
parent | f984370913d3ba5d13806cc8ac6fc26f8ebd1694 (diff) | |
parent | 6310f3a9362e8fa2e29c8f84aa603b5f86e98442 (diff) |
Merge branch 'omap-for-v3.13/fixes-take4' into omap-for-v3.14/board-removal
Diffstat (limited to 'drivers/media/pci/bt8xx/bttv-driver.c')
-rw-r--r-- | drivers/media/pci/bt8xx/bttv-driver.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/pci/bt8xx/bttv-driver.c b/drivers/media/pci/bt8xx/bttv-driver.c index c6532de0eac..a3b1ee9c00d 100644 --- a/drivers/media/pci/bt8xx/bttv-driver.c +++ b/drivers/media/pci/bt8xx/bttv-driver.c @@ -4086,7 +4086,7 @@ static int bttv_probe(struct pci_dev *dev, const struct pci_device_id *pci_id) /* disable irqs, register irq handler */ btwrite(0, BT848_INT_MASK); result = request_irq(btv->c.pci->irq, bttv_irq, - IRQF_SHARED | IRQF_DISABLED, btv->c.v4l2_dev.name, (void *)btv); + IRQF_SHARED, btv->c.v4l2_dev.name, (void *)btv); if (result < 0) { pr_err("%d: can't get IRQ %d\n", bttv_num, btv->c.pci->irq); |