Commit a26ccc9d authored by Steven Toth's avatar Steven Toth Committed by Mauro Carvalho Chehab

V4L/DVB (11666): cx23885: Don't assume GPIO interrupts are cam related.

cx23885: Don't assume GPIO interrupts are cam related.
Signed-off-by: default avatarSteven Toth <stoth@linuxtv.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 501d8cd4
...@@ -1700,10 +1700,14 @@ static irqreturn_t cx23885_irq(int irq, void *dev_id) ...@@ -1700,10 +1700,14 @@ static irqreturn_t cx23885_irq(int irq, void *dev_id)
} }
if (cx23885_boards[dev->board].cimax > 0 && if (cx23885_boards[dev->board].cimax > 0 &&
((pci_status & PCI_MSK_GPIO0) || (pci_status & PCI_MSK_GPIO1))) ((pci_status & PCI_MSK_GPIO0) ||
/* handled += cx23885_irq_gpio(dev, pci_status); */ (pci_status & PCI_MSK_GPIO1))) {
if (cx23885_boards[dev->board].cimax > 0)
handled += netup_ci_slot_status(dev, pci_status); handled += netup_ci_slot_status(dev, pci_status);
}
if (ts1_status) { if (ts1_status) {
if (cx23885_boards[dev->board].portb == CX23885_MPEG_DVB) if (cx23885_boards[dev->board].portb == CX23885_MPEG_DVB)
handled += cx23885_irq_ts(ts1, ts1_status); handled += cx23885_irq_ts(ts1, ts1_status);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment