From 9372d1256ae2e34e9270f6c044a2815bac8b505c Mon Sep 17 00:00:00 2001
From: Steven Toth <stoth@hauppauge.com>
Date: Mon, 30 Jun 2008 22:17:05 -0300
Subject: [PATCH] --- yaml --- r: 106725 b: refs/heads/master c:
 6df516905b5c53b306d90be33f9c56434e8db053 h: refs/heads/master i:   106723:
 c27dac6fe5d08c6ccd5e6d2ce1846df3c67c1baa v: v3

---
 [refs]                                        |  2 +-
 .../media/video/cx23885/cx23885-cards.c       | 40 +++++++++++++------
 2 files changed, 29 insertions(+), 13 deletions(-)

diff --git a/[refs] b/[refs]
index 302ce419dd2f..a13575b162ea 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1ecc5aed1ea426dbb7e5cd9a0c980c14c879277b
+refs/heads/master: 6df516905b5c53b306d90be33f9c56434e8db053
diff --git a/trunk/drivers/media/video/cx23885/cx23885-cards.c b/trunk/drivers/media/video/cx23885/cx23885-cards.c
index 691b35279c20..a19de850955d 100644
--- a/trunk/drivers/media/video/cx23885/cx23885-cards.c
+++ b/trunk/drivers/media/video/cx23885/cx23885-cards.c
@@ -326,25 +326,41 @@ int cx23885_tuner_callback(void *priv, int command, int arg)
 {
 	struct cx23885_i2c *bus = priv;
 	struct cx23885_dev *dev = bus->dev;
+	u32 bitmask = 0;
+
+	if (command != 0) {
+		printk(KERN_ERR "%s(): Unknown command 0x%x.\n",
+			__func__, command);
+		return -EINVAL;
+	}
 
 	switch(dev->board) {
 	case CX23885_BOARD_HAUPPAUGE_HVR1500Q:
-		if(command == 0) {	/* Tuner Reset Command from xc5000 */
-			/* Drive the tuner into reset and out */
-			cx_clear(GP0_IO, 0x00000004);
-			mdelay(200);
-			cx_set(GP0_IO, 0x00000004);
-			return 0;
-		}
-		else {
-			printk(KERN_ERR
-				"%s(): Unknow command.\n", __func__);
-			return -EINVAL;
+		/* Tuner Reset Command from xc5000 */
+		if (command == 0)
+			bitmask = 0x04;
+		break;
+	case CX23885_BOARD_DVICO_FUSIONHDTV_7_DUAL_EXP:
+		if (command == 0) {
+
+			/* Two identical tuners on two different i2c buses,
+			 * we need to reset the correct gpio. */
+			if (bus->nr == 0)
+				bitmask = 0x01;
+			else if (bus->nr == 1)
+				bitmask = 0x04;
 		}
 		break;
 	}
 
-	return 0; /* Should never be here */
+	if (bitmask) {
+		/* Drive the tuner into reset and back out */
+		cx_clear(GP0_IO, bitmask);
+		mdelay(200);
+		cx_set(GP0_IO, bitmask);
+	}
+
+	return 0;
 }
 
 void cx23885_gpio_setup(struct cx23885_dev *dev)