From 97487d30b80af38d267739029ea9a077bd79f86b Mon Sep 17 00:00:00 2001
From: Michael Krufky <mkrufky@linuxtv.org>
Date: Sat, 29 Sep 2012 16:06:23 -0300
Subject: [PATCH] --- yaml --- r: 331222 b: refs/heads/master c:
 4cfae67515ed4c7bf5bb94fde20130153936f465 h: refs/heads/master v: v3

---
 [refs]                                   | 2 +-
 trunk/drivers/media/tuners/tda18271-fe.c | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 836aee2422f7..9250bce6d0c6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 185e4768b864b3b65c5d2cdca9be556d493f15e1
+refs/heads/master: 4cfae67515ed4c7bf5bb94fde20130153936f465
diff --git a/trunk/drivers/media/tuners/tda18271-fe.c b/trunk/drivers/media/tuners/tda18271-fe.c
index 5f5d866d3fc9..de21197ca4b9 100644
--- a/trunk/drivers/media/tuners/tda18271-fe.c
+++ b/trunk/drivers/media/tuners/tda18271-fe.c
@@ -1285,6 +1285,10 @@ struct dvb_frontend *tda18271_attach(struct dvb_frontend *fe, u8 addr,
 		    (priv->id == TDA18271HDC2))
 			tda18271c2_rf_cal_init(fe);
 
+		/* enter standby mode, with required output features enabled */
+		ret = tda18271_toggle_output(fe, 1);
+		tda_fail(ret);
+
 		mutex_unlock(&priv->lock);
 		break;
 	default:
@@ -1323,9 +1327,6 @@ struct dvb_frontend *tda18271_attach(struct dvb_frontend *fe, u8 addr,
 	if (tda18271_debug & (DBG_MAP | DBG_ADV))
 		tda18271_dump_std_map(fe);
 
-	ret = tda18271_sleep(fe);
-	tda_fail(ret);
-
 	return fe;
 fail:
 	mutex_unlock(&tda18271_list_mutex);