From 163ea613b0c539d794869951d7d71524440f6a0c Mon Sep 17 00:00:00 2001
From: "Igor M. Liplianin" <liplianin@me.by>
Date: Tue, 1 Feb 2011 19:40:03 -0300
Subject: [PATCH] --- yaml --- r: 241927 b: refs/heads/master c:
 a0ea298d57153cf71f9f7628830dbba1a9a8a15d h: refs/heads/master i:   241925:
 2879d0eff9bb46264b53adf272a4f3575fc151f6   241923:
 0eb712f60dbdb0e64e8af13a5b2c6f4497f84998   241919:
 ef5b642b7d600088dd0cb81016fd9df9295e312f v: v3

---
 [refs]                                     |  2 +-
 trunk/drivers/media/dvb/frontends/ds3000.c | 16 ++++++++++++----
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 2edf991e4012..0aa254def16b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6951803c2402d1af0e76df051cc9b117f504550f
+refs/heads/master: a0ea298d57153cf71f9f7628830dbba1a9a8a15d
diff --git a/trunk/drivers/media/dvb/frontends/ds3000.c b/trunk/drivers/media/dvb/frontends/ds3000.c
index fc61d9230db8..655f182e7ff4 100644
--- a/trunk/drivers/media/dvb/frontends/ds3000.c
+++ b/trunk/drivers/media/dvb/frontends/ds3000.c
@@ -1065,10 +1065,6 @@ static int ds3000_tune(struct dvb_frontend *fe,
 		/* Reset status register */
 		status = 0;
 		/* Tune */
-		/* TS2020 init */
-		ds3000_tuner_writereg(state, 0x42, 0x73);
-		ds3000_tuner_writereg(state, 0x05, 0x01);
-		ds3000_tuner_writereg(state, 0x62, 0xf5);
 		/* unknown */
 		ds3000_tuner_writereg(state, 0x07, 0x02);
 		ds3000_tuner_writereg(state, 0x10, 0x00);
@@ -1306,7 +1302,19 @@ static enum dvbfe_algo ds3000_get_algo(struct dvb_frontend *fe)
  */
 static int ds3000_initfe(struct dvb_frontend *fe)
 {
+	struct ds3000_state *state = fe->demodulator_priv;
+	int ret;
+
 	dprintk("%s()\n", __func__);
+	/* hard reset */
+	ds3000_writereg(state, 0x08, 0x01 | ds3000_readreg(state, 0x08));
+	msleep(1);
+
+	/* TS2020 init */
+	ds3000_tuner_writereg(state, 0x42, 0x73);
+	ds3000_tuner_writereg(state, 0x05, 0x01);
+	ds3000_tuner_writereg(state, 0x62, 0xf5);
+
 	return 0;
 }