---

yaml --- r: 241927 b: refs/heads/master c: a0ea298 h: refs/heads/master i: 241925: 2879d0e 241923: 0eb712f 241919: ef5b642 v: v3
git-mirror · Mar 21, 2011 · 163ea61 · 163ea61
1 parent da6afd6
commit 163ea61
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git 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
@@ -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;
 }