From 2acfb83caea1faf3ceddfb8c38e395fce84ee507 Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Thu, 13 Jan 2011 14:01:39 -0300
Subject: [PATCH] --- yaml --- r: 232198 b: refs/heads/master c:
 9d700a0696ae241380e8ca833bb5a358620d33f6 h: refs/heads/master v: v3

---
 [refs]                                      |  2 +-
 trunk/drivers/media/common/tuners/tda8290.c | 11 ++++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index f84fe6bfdd2c..35ffd223d2bd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 47ab285a960ac456506297c93322ab13c3522f5a
+refs/heads/master: 9d700a0696ae241380e8ca833bb5a358620d33f6
diff --git a/trunk/drivers/media/common/tuners/tda8290.c b/trunk/drivers/media/common/tuners/tda8290.c
index 11ea4e0f9c04..419d064a0188 100644
--- a/trunk/drivers/media/common/tuners/tda8290.c
+++ b/trunk/drivers/media/common/tuners/tda8290.c
@@ -754,11 +754,10 @@ struct dvb_frontend *tda829x_attach(struct dvb_frontend *fe,
 		       sizeof(struct analog_demod_ops));
 	}
 
-	if ((!(cfg) || (TDA829X_PROBE_TUNER == cfg->probe_tuner)) &&
-	    (tda829x_find_tuner(fe) < 0)) {
-		memset(&fe->ops.analog_ops, 0, sizeof(struct analog_demod_ops));
-
-		goto fail;
+	if (!(cfg) || (TDA829X_PROBE_TUNER == cfg->probe_tuner)) {
+		tda8295_power(fe, 1);
+		if (tda829x_find_tuner(fe) < 0)
+			goto fail;
 	}
 
 	switch (priv->ver) {
@@ -803,6 +802,8 @@ struct dvb_frontend *tda829x_attach(struct dvb_frontend *fe,
 	return fe;
 
 fail:
+	memset(&fe->ops.analog_ops, 0, sizeof(struct analog_demod_ops));
+
 	tda829x_release(fe);
 	return NULL;
 }