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

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

drivers/media/video/cx23885/cx23885-core.c

+7 −3
Original line number Diff line number Diff line
@@ -1700,10 +1700,14 @@ 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); */

		((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)

			handled += cx23885_irq_ts(ts1, ts1_status);