From 447149dc9008f15393c1ce12de22d066d0780c8c Mon Sep 17 00:00:00 2001
From: Andreas Regel <andreas.regel@gmx.de>
Date: Tue, 5 Jan 2010 19:23:41 -0300
Subject: [PATCH] --- yaml --- r: 181517 b: refs/heads/master c:
 9045e729447192ab0ca27191ccab324c6b97fceb h: refs/heads/master i:   181515:
 7598f5ef3db4e3ab1e2fdcfe987ffeca5dc52c00 v: v3

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

diff --git a/[refs] b/[refs]
index 4633886ab76e..5306057b7cc2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ec2d3a62eff54b9dc556e9d9c9125b9bdc640171
+refs/heads/master: 9045e729447192ab0ca27191ccab324c6b97fceb
diff --git a/trunk/drivers/media/dvb/frontends/stv090x.c b/trunk/drivers/media/dvb/frontends/stv090x.c
index 93be76ced896..4dc30911f408 100644
--- a/trunk/drivers/media/dvb/frontends/stv090x.c
+++ b/trunk/drivers/media/dvb/frontends/stv090x.c
@@ -4292,6 +4292,15 @@ static int stv090x_init(struct dvb_frontend *fe)
 	const struct stv090x_config *config = state->config;
 	u32 reg;
 
+	if (state->internal->mclk == 0) {
+		stv090x_set_mclk(state, 135000000, config->xtal); /* 135 Mhz */
+		msleep(5);
+		if (stv090x_write_reg(state, STV090x_SYNTCTRL,
+				      0x20 | config->clk_mode) < 0)
+			goto err;
+		stv090x_get_mclk(state);
+	}
+
 	if (stv090x_wakeup(fe) < 0) {
 		dprintk(FE_ERROR, 1, "Error waking device");
 		goto err;
@@ -4426,12 +4435,6 @@ static int stv090x_setup(struct dvb_frontend *fe)
 	if (stv090x_write_reg(state, STV090x_TSTRES0, 0x00) < 0)
 		goto err;
 
-	stv090x_set_mclk(state, 135000000, config->xtal); /* 135 Mhz */
-	msleep(5);
-	if (stv090x_write_reg(state, STV090x_SYNTCTRL, 0x20 | config->clk_mode) < 0)
-		goto err;
-	stv090x_get_mclk(state);
-
 	return 0;
 err:
 	dprintk(FE_ERROR, 1, "I/O error");