diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-03-29 04:37:46 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-03-29 04:37:46 -0300 |
| commit | be91c19fe859cc841a29603d943e915f7691bc95 (patch) | |
| tree | b72344c4a1f05605d2b66cefd90c051737197376 /linux/drivers/media/video/cx23885/cx23885-core.c | |
| parent | 01a9b73d338c6ac427e752fbc56c85d1ab5259b9 (diff) | |
| parent | 2cc0abb17583ba0769357943dee38920a8cd757e (diff) | |
| download | mediapointer-dvb-s2-be91c19fe859cc841a29603d943e915f7691bc95.tar.gz mediapointer-dvb-s2-be91c19fe859cc841a29603d943e915f7691bc95.tar.bz2 | |
merge: http://linuxtv.org/hg/~mkrufky/tuner
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/cx23885/cx23885-core.c')
| -rw-r--r-- | linux/drivers/media/video/cx23885/cx23885-core.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/linux/drivers/media/video/cx23885/cx23885-core.c b/linux/drivers/media/video/cx23885/cx23885-core.c index 6ae7ee247..d894d4900 100644 --- a/linux/drivers/media/video/cx23885/cx23885-core.c +++ b/linux/drivers/media/video/cx23885/cx23885-core.c @@ -1710,7 +1710,8 @@ static irqreturn_t cx23885_irq(int irq, void *dev_id) PCI_MSK_GPIO1); } - if ((pci_status & PCI_MSK_GPIO0) || (pci_status & PCI_MSK_GPIO1)) + 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); @@ -1786,7 +1787,12 @@ static int __devinit cx23885_initdev(struct pci_dev *pci_dev, } pci_set_drvdata(pci_dev, dev); - cx_set(PCI_INT_MSK, 0x01800000); /* for NetUP */ + + switch (dev->board) { + case CX23885_BOARD_NETUP_DUAL_DVBS2_CI: + cx_set(PCI_INT_MSK, 0x01800000); /* for NetUP */ + break; + } return 0; |