diff options
author | Steven Toth <stoth@linuxtv.org> | 2009-04-29 19:49:12 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-06-16 17:20:50 -0400 |
commit | a26ccc9d76a16580c6800ef0758556c4406a31e0 (patch) | |
tree | 5fd9047f47aac0ef9ca6a3b855522da174160444 /drivers/media | |
parent | 501d8cd4e248feebd465b016a7d5b7bc084f5f1f (diff) |
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')
-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 beda42925ce..9e4d37eb918 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) | |||
1700 | } | 1700 | } |
1701 | 1701 | ||
1702 | if (cx23885_boards[dev->board].cimax > 0 && | 1702 | if (cx23885_boards[dev->board].cimax > 0 && |
1703 | ((pci_status & PCI_MSK_GPIO0) || (pci_status & PCI_MSK_GPIO1))) | 1703 | ((pci_status & PCI_MSK_GPIO0) || |
1704 | /* handled += cx23885_irq_gpio(dev, pci_status); */ | 1704 | (pci_status & PCI_MSK_GPIO1))) { |
1705 | handled += netup_ci_slot_status(dev, pci_status); | 1705 | |
1706 | if (cx23885_boards[dev->board].cimax > 0) | ||
1707 | handled += netup_ci_slot_status(dev, pci_status); | ||
1708 | |||
1709 | } | ||
1706 | 1710 | ||
1707 | if (ts1_status) { | 1711 | if (ts1_status) { |
1708 | if (cx23885_boards[dev->board].portb == CX23885_MPEG_DVB) | 1712 | if (cx23885_boards[dev->board].portb == CX23885_MPEG_DVB) |