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>

diff --git a/drivers/media/video/cx23885/cx23885-core.c b/drivers/media/video/cx23885/cx23885-core.c
index beda42925ce761c961e7b08673a195cd6e6017fe..9e4d37eb918ed20e1fd5f42b065ec9b74350aa2c 100644 (file)
--- 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)