From: Andreas Regel <andreas.regel@gmx.de>
Date: Thu, 23 Apr 2009 17:59:03 +0000 (-0300)
Subject: V4L/DVB (11598): stv090x: fix missing wakeup in init
X-Git-Tag: v2.6.31-rc1~297^2~323
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=cbc320d2782cbb0c19e67522167843d9eb738722;p=karo-tx-linux.git

V4L/DVB (11598): stv090x: fix missing wakeup in init

Signed-off-by: Andreas Regel <andreas.regel@gmx.de>
Signed-off-by: Manu Abraham <manu@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
---

diff --git a/drivers/media/dvb/frontends/stv090x.c b/drivers/media/dvb/frontends/stv090x.c
index 6c0378ddebc5..9f69317f81c2 100644
--- a/drivers/media/dvb/frontends/stv090x.c
+++ b/drivers/media/dvb/frontends/stv090x.c
@@ -3880,6 +3880,11 @@ static int stv090x_init(struct dvb_frontend *fe)
 	const struct stv090x_config *config = state->config;
 	u32 reg;
 
+	if (stv090x_wakeup(fe) < 0) {
+		dprintk(FE_ERROR, 1, "Error waking device");
+		goto err;
+	}
+
 	stv090x_ldpc_mode(state, state->demod_mode);
 
 	reg = STV090x_READ_DEMOD(state, TNRCFG2);
@@ -3893,6 +3898,8 @@ static int stv090x_init(struct dvb_frontend *fe)
 
 	stv090x_i2c_gate_ctrl(fe, 1);
 
+	if (config->tuner_set_mode)
+		config->tuner_set_mode(fe, TUNER_WAKE);
 	if (config->tuner_init)
 		config->tuner_init(fe);