diff options
| author | Steven Toth <stoth@linuxtv.org> | 2009-04-29 19:49:12 -0400 |
|---|---|---|
| committer | Steven Toth <stoth@linuxtv.org> | 2009-04-29 19:49:12 -0400 |
| commit | 792254c7ef1bcee499b53704869d84cc8c2b280d (patch) | |
| tree | 48edaab56151384ba4e9c5fa07a08abe3a93aeee /linux | |
| parent | 2223f3be8a747246fc0a5956421bdbabfe8cdbcc (diff) | |
| download | mediapointer-dvb-s2-792254c7ef1bcee499b53704869d84cc8c2b280d.tar.gz mediapointer-dvb-s2-792254c7ef1bcee499b53704869d84cc8c2b280d.tar.bz2 | |
cx23885: Don't assume GPIO interrupts are cam related.
From: Steven Toth <stoth@linuxtv.org>
cx23885: Don't assume GPIO interrupts are cam related.
Priority: normal
Signed-off-by: Steven Toth <stoth@linuxtv.org>
Diffstat (limited to 'linux')
| -rw-r--r-- | linux/drivers/media/video/cx23885/cx23885-core.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/linux/drivers/media/video/cx23885/cx23885-core.c b/linux/drivers/media/video/cx23885/cx23885-core.c index 81fa577a6..48f777b99 100644 --- a/linux/drivers/media/video/cx23885/cx23885-core.c +++ b/linux/drivers/media/video/cx23885/cx23885-core.c @@ -1711,9 +1711,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) |