aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/dvb/frontends/stv090x.c
diff options
context:
space:
mode:
authorManu Abraham <abraham.manu@gmail.com>2010-01-23 05:49:08 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-05-18 00:46:47 -0300
commitc5b74b0f5e81386ca1e9b1128de83502e92fa028 (patch)
tree581f8bdba31fc29a576440bbd85373a435a04bfa /drivers/media/dvb/frontends/stv090x.c
parent19c4ee58325ac7c9d9595153fabb5d885dfe931e (diff)
downloadkernel_samsung_smdk4412-c5b74b0f5e81386ca1e9b1128de83502e92fa028.zip
kernel_samsung_smdk4412-c5b74b0f5e81386ca1e9b1128de83502e92fa028.tar.gz
kernel_samsung_smdk4412-c5b74b0f5e81386ca1e9b1128de83502e92fa028.tar.bz2
V4L/DVB: [STV090x, STV6110x] Use tuner sleep within the demodulator control
Oliver Endriss <o.endriss@gmx.de> pointed out: Imho not a good idea, as the frontend thread calls - fe->ops.tuner_ops.init - fe->ops.tuner_ops.sleep If you remove fe->ops.i2c_gate_ctrl, init and sleep will fail, because gate_ctrl was never called... -- Signed-off-by: Manu Abraham <manu@gmail.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/dvb/frontends/stv090x.c')
-rw-r--r--drivers/media/dvb/frontends/stv090x.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/media/dvb/frontends/stv090x.c b/drivers/media/dvb/frontends/stv090x.c
index 0af1708..a80a34b 100644
--- a/drivers/media/dvb/frontends/stv090x.c
+++ b/drivers/media/dvb/frontends/stv090x.c
@@ -3838,6 +3838,11 @@ static int stv090x_sleep(struct dvb_frontend *fe)
struct stv090x_state *state = fe->demodulator_priv;
u32 reg;
+ if (state->config->tuner_init) {
+ if (state->config->tuner_sleep(fe) < 0)
+ goto err_gateoff;
+ }
+
dprintk(FE_DEBUG, 1, "Set %s to sleep",
state->device == STV0900 ? "STV0900" : "STV0903");
@@ -3852,6 +3857,9 @@ static int stv090x_sleep(struct dvb_frontend *fe)
goto err;
return 0;
+
+err_gateoff:
+ stv090x_i2c_gate_ctrl(state, 0);
err:
dprintk(FE_ERROR, 1, "I/O error");
return -1;