diff options
| author |   Steven Toth <stoth@linuxtv.org> | 2009-04-29 20:49:12 -0300 |
|---|---|---|
| committer |   Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-06-16 18:20:50 -0300 |
| commit | a26ccc9d76a16580c6800ef0758556c4406a31e0 (patch) | |
| tree | 5fd9047f47aac0ef9ca6a3b855522da174160444 /drivers/media/video/cx23885/cx23885-core.c | |
| parent | V4L/DVB (11665): cx88: Add support for the Hauppauge IROnly board. (diff) | |
| download | linux-dev-a26ccc9d76a16580c6800ef0758556c4406a31e0.tar.xz linux-dev-a26ccc9d76a16580c6800ef0758556c4406a31e0.zip | |
V4L/DVB (11666): cx23885: Don't assume GPIO interrupts are cam related.
cx23885: Don't assume GPIO interrupts are cam related.
Signed-off-by: Steven Toth <stoth@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/cx23885/cx23885-core.c')
| -rw-r--r-- | drivers/media/video/cx23885/cx23885-core.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/drivers/media/video/cx23885/cx23885-core.c b/drivers/media/video/cx23885/cx23885-core.c index beda42925ce7..9e4d37eb918e 100644 --- a/drivers/media/video/cx23885/cx23885-core.c +++ b/drivers/media/video/cx23885/cx23885-core.c @@ -1700,9 +1700,13 @@ static irqreturn_t cx23885_irq(int irq, void *dev_id) } if (cx23885_boards[dev->board].cimax > 0 && - ((pci_status & PCI_MSK_GPIO0) || (pci_status & PCI_MSK_GPIO1))) - /* handled += cx23885_irq_gpio(dev, pci_status); */ - handled += netup_ci_slot_status(dev, pci_status); + ((pci_status & PCI_MSK_GPIO0) || + (pci_status & PCI_MSK_GPIO1))) { + + if (cx23885_boards[dev->board].cimax > 0) + handled += netup_ci_slot_status(dev, pci_status); + + } if (ts1_status) { if (cx23885_boards[dev->board].portb == CX23885_MPEG_DVB) |