From cf93d4a5a0f43e2af26723aa3b118c75ccd27f83 Mon Sep 17 00:00:00 2001
From: Patrick Boettcher <pb@linuxtv.org>
Date: Sat, 6 Sep 2008 13:31:58 -0300
Subject: [PATCH] --- yaml --- r: 110199 b: refs/heads/master c:
 c18c5ffe13e553cf670da521fe09150c36edeb61 h: refs/heads/master i:   110197:
 8a47868eeacbb6a7d56dd1ff199933e9eec9fa23   110195:
 4f9cbcc6f3f0f86bd69c42d69d58ce0e3113f55b   110191:
 50bb0bc348f18709440cdee12b768a146ebbc7a7 v: v3

---
 [refs]                                          | 2 +-
 trunk/drivers/media/dvb/b2c2/flexcop-fe-tuner.c | 1 +
 trunk/drivers/media/dvb/frontends/s5h1420.c     | 9 ++++++---
 trunk/drivers/media/dvb/frontends/s5h1420.h     | 8 +++++---
 4 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index eecdb3b49ab2..e25d915d1fba 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dda06a8e4610757def753ee3a541a0b1a1feb36b
+refs/heads/master: c18c5ffe13e553cf670da521fe09150c36edeb61
diff --git a/trunk/drivers/media/dvb/b2c2/flexcop-fe-tuner.c b/trunk/drivers/media/dvb/b2c2/flexcop-fe-tuner.c
index 4eed783f4bce..a127a4175c40 100644
--- a/trunk/drivers/media/dvb/b2c2/flexcop-fe-tuner.c
+++ b/trunk/drivers/media/dvb/b2c2/flexcop-fe-tuner.c
@@ -491,6 +491,7 @@ static struct s5h1420_config skystar2_rev2_7_s5h1420_config = {
 	.demod_address = 0x53,
 	.invert = 1,
 	.repeated_start_workaround = 1,
+	.serial_mpeg = 1,
 };
 
 static struct itd1000_config skystar2_rev2_7_itd1000_config = {
diff --git a/trunk/drivers/media/dvb/frontends/s5h1420.c b/trunk/drivers/media/dvb/frontends/s5h1420.c
index 747d3fa2e5e5..7d6cb39da1d9 100644
--- a/trunk/drivers/media/dvb/frontends/s5h1420.c
+++ b/trunk/drivers/media/dvb/frontends/s5h1420.c
@@ -94,8 +94,11 @@ static u8 s5h1420_readreg(struct s5h1420_state *state, u8 reg)
 		if (ret != 3)
 			return ret;
 	} else {
-		ret = i2c_transfer(state->i2c, &msg[1], 2);
-		if (ret != 2)
+		ret = i2c_transfer(state->i2c, &msg[1], 1);
+		if (ret != 1)
+			return ret;
+		ret = i2c_transfer(state->i2c, &msg[2], 1);
+		if (ret != 1)
 			return ret;
 	}
 
@@ -823,7 +826,7 @@ static int s5h1420_init (struct dvb_frontend* fe)
 	struct s5h1420_state* state = fe->demodulator_priv;
 
 	/* disable power down and do reset */
-	state->CON_1_val = 0x10;
+	state->CON_1_val = state->config->serial_mpeg << 4;
 	s5h1420_writereg(state, 0x02, state->CON_1_val);
 	msleep(10);
 	s5h1420_reset(state);
diff --git a/trunk/drivers/media/dvb/frontends/s5h1420.h b/trunk/drivers/media/dvb/frontends/s5h1420.h
index 4c913f142bc4..ff308136d865 100644
--- a/trunk/drivers/media/dvb/frontends/s5h1420.h
+++ b/trunk/drivers/media/dvb/frontends/s5h1420.h
@@ -32,10 +32,12 @@ struct s5h1420_config
 	u8 demod_address;
 
 	/* does the inversion require inversion? */
-	u8 invert : 1;
+	u8 invert:1;
 
-	u8 repeated_start_workaround : 1;
-	u8 cdclk_polarity : 1; /* 1 == falling edge, 0 == raising edge */
+	u8 repeated_start_workaround:1;
+	u8 cdclk_polarity:1; /* 1 == falling edge, 0 == raising edge */
+
+	u8 serial_mpeg:1;
 };
 
 #if defined(CONFIG_DVB_S5H1420) || (defined(CONFIG_DVB_S5H1420_MODULE) && defined(MODULE))