From: Michael Krufky <mkrufky@linuxtv.org>
Date: Fri, 23 Nov 2007 18:08:11 +0000 (-0300)
Subject: V4L/DVB (6679): tda8290: force tuner init after attach
X-Git-Tag: v2.6.25-rc1~1235^2~295
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=63c254805e38bad4c64b5f5b0e135a2a357fa0bf;p=linux-2.6

V4L/DVB (6679): tda8290: force tuner init after attach

Force tuner init after attach, then sleep until use.

Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
---

diff --git a/drivers/media/video/tda8290.c b/drivers/media/video/tda8290.c
index c606f3c38c..09efb6a60d 100644
--- a/drivers/media/video/tda8290.c
+++ b/drivers/media/video/tda8290.c
@@ -597,13 +597,13 @@ static int tda829x_find_tuner(struct dvb_frontend *fe)
 
 		tda827x_attach(&t->fe, priv->tda827x_addr,
 			       priv->i2c_props.adap, &priv->cfg);
-
-		/* FIXME: tda827x module doesn't probe the tuner until
-		 * tda827x_initial_sleep is called
-		 */
-		if (t->fe.ops.tuner_ops.sleep)
-			t->fe.ops.tuner_ops.sleep(&t->fe);
 	}
+	if (t->fe.ops.tuner_ops.init)
+		t->fe.ops.tuner_ops.init(&t->fe);
+
+	if (t->fe.ops.tuner_ops.sleep)
+		t->fe.ops.tuner_ops.sleep(&t->fe);
+
 	ops->i2c_gate_ctrl(fe, 0);
 
 	switch (priv->ver) {