From b0ce7645cfe217bb7dee90679a656ee89d3f7022 Mon Sep 17 00:00:00 2001
From: Michael Krufky <mkrufky@kernellabs.com>
Date: Mon, 12 Mar 2012 17:07:22 -0300
Subject: [PATCH] --- yaml --- r: 295098 b: refs/heads/master c:
 ef3d2dc366c8c32d58dbbf9898cfd4f853ff8fe0 h: refs/heads/master v: v3

---
 [refs]                                         |  2 +-
 trunk/drivers/media/dvb/frontends/au8522_dig.c | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 4cf558d56f73..e867b125042c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 22f1732fcda5ab62b6da2ddcec282868e7ccb089
+refs/heads/master: ef3d2dc366c8c32d58dbbf9898cfd4f853ff8fe0
diff --git a/trunk/drivers/media/dvb/frontends/au8522_dig.c b/trunk/drivers/media/dvb/frontends/au8522_dig.c
index c688b95df486..25f650934c73 100644
--- a/trunk/drivers/media/dvb/frontends/au8522_dig.c
+++ b/trunk/drivers/media/dvb/frontends/au8522_dig.c
@@ -588,11 +588,6 @@ static int au8522_set_frontend(struct dvb_frontend *fe)
 	    (state->current_modulation == c->modulation))
 		return 0;
 
-	au8522_enable_modulation(fe, c->modulation);
-
-	/* Allow the demod to settle */
-	msleep(100);
-
 	if (fe->ops.tuner_ops.set_params) {
 		if (fe->ops.i2c_gate_ctrl)
 			fe->ops.i2c_gate_ctrl(fe, 1);
@@ -604,6 +599,11 @@ static int au8522_set_frontend(struct dvb_frontend *fe)
 	if (ret < 0)
 		return ret;
 
+	/* Allow the tuner to settle */
+	msleep(100);
+
+	au8522_enable_modulation(fe, c->modulation);
+
 	state->current_frequency = c->frequency;
 
 	return 0;