From 2b01c23e6991ab3717746c564f42beeb6597f295 Mon Sep 17 00:00:00 2001
From: Steven Toth <stoth@linuxtv.org>
Date: Mon, 22 Sep 2008 01:46:26 -0300
Subject: [PATCH] --- yaml --- r: 113983 b: refs/heads/master c:
 1cbd89dbde2a473f2f3d47ae31163d80fc8ca7e7 h: refs/heads/master i:   113981:
 e2b79abb38d43a0c462e29f50c2194fc7ba69a4e   113979:
 e50f27b4e03c7ba4271cb366b944834caf9f9a40   113975:
 2138c954451ba91ccf7460c112120cfbb1407102   113967:
 598499f9c89613fe74b679636471bbd34506883f   113951:
 db355fd22e97b33eb266b5c650f7406868640ffc   113919:
 68c326429df02b54cf48f87a549218ac3ff94709 v: v3

---
 [refs]                                    |  2 +-
 trunk/drivers/media/video/cx88/cx88-i2c.c | 16 ++++++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index c09e4af77bd2..9e65455efa4a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5bacea3b9db1b88eeae5427f41efe65138f056da
+refs/heads/master: 1cbd89dbde2a473f2f3d47ae31163d80fc8ca7e7
diff --git a/trunk/drivers/media/video/cx88/cx88-i2c.c b/trunk/drivers/media/video/cx88/cx88-i2c.c
index d7406a994f09..8e74d64fdcd2 100644
--- a/trunk/drivers/media/video/cx88/cx88-i2c.c
+++ b/trunk/drivers/media/video/cx88/cx88-i2c.c
@@ -201,7 +201,23 @@ int cx88_i2c_init(struct cx88_core *core, struct pci_dev *pci)
 
 	core->i2c_rc = i2c_bit_add_bus(&core->i2c_adap);
 	if (0 == core->i2c_rc) {
+		static u8 tuner_data[] =
+			{ 0x0b, 0xdc, 0x86, 0x52 };
+		static struct i2c_msg tuner_msg =
+			{ .flags = 0, .addr = 0xc2 >> 1, .buf = tuner_data, .len = 4 };
+
 		dprintk(1, "i2c register ok\n");
+		switch( core->boardnr ) {
+			case CX88_BOARD_HAUPPAUGE_HVR1300:
+			case CX88_BOARD_HAUPPAUGE_HVR3000:
+			case CX88_BOARD_HAUPPAUGE_HVR4000:
+				printk("%s: i2c init: enabling analog demod on HVR1300/3000/4000 tuner\n",
+					core->name);
+				i2c_transfer(core->i2c_client.adapter, &tuner_msg, 1);
+				break;
+			default:
+				break;
+		}
 		if (i2c_scan)
 			do_i2c_scan(core->name,&core->i2c_client);
 	} else