---

yaml --- r: 138162 b: refs/heads/master c: afd9666 h: refs/heads/master v: v3
git-mirror · Mar 30, 2009 · eb9beb1 · eb9beb1
1 parent e1b5266
commit eb9beb1
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9832d765f82769799ba15ac9d2e8edf8f7de6898
+refs/heads/master: afd96668d8491f762e35c16ce65781da820a67fa
diff --git a/trunk/drivers/media/video/cx23885/cx23885-core.c b/trunk/drivers/media/video/cx23885/cx23885-core.c
@@ -1699,7 +1699,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);
 
@@ -1775,7 +1776,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;
 

diff --git a/trunk/drivers/media/video/cx23885/cx23885-dvb.c b/trunk/drivers/media/video/cx23885/cx23885-dvb.c
@@ -778,7 +778,11 @@ int cx23885_dvb_unregister(struct cx23885_tsport *port)
 	if (fe0->dvb.frontend)
 		videobuf_dvb_unregister_bus(&port->frontends);
 
-	netup_ci_exit(port);
+	switch (port->dev->board) {
+	case CX23885_BOARD_NETUP_DUAL_DVBS2_CI:
+		netup_ci_exit(port);
+		break;
+	}
 
 	return 0;
 }