aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/media/dvb/frontends/l64781.c7
-rw-r--r--drivers/media/dvb/frontends/l64781.h4
2 files changed, 4 insertions, 7 deletions
diff --git a/drivers/media/dvb/frontends/l64781.c b/drivers/media/dvb/frontends/l64781.c
index 1c7c91224472..fa4a87e0049e 100644
--- a/drivers/media/dvb/frontends/l64781.c
+++ b/drivers/media/dvb/frontends/l64781.c
@@ -141,7 +141,10 @@ static int apply_frontend_param (struct dvb_frontend* fe, struct dvb_frontend_pa
141 u8 val0x06; 141 u8 val0x06;
142 int bw = p->bandwidth - BANDWIDTH_8_MHZ; 142 int bw = p->bandwidth - BANDWIDTH_8_MHZ;
143 143
144 state->config->pll_set(fe, param); 144 if (fe->ops->tuner_ops.set_params) {
145 fe->ops->tuner_ops.set_params(fe, param);
146 if (fe->ops->i2c_gate_ctrl) fe->ops->i2c_gate_ctrl(fe, 0);
147 }
145 148
146 if (param->inversion != INVERSION_ON && 149 if (param->inversion != INVERSION_ON &&
147 param->inversion != INVERSION_OFF) 150 param->inversion != INVERSION_OFF)
@@ -463,8 +466,6 @@ static int l64781_init(struct dvb_frontend* fe)
463 /* Everything is two's complement, soft bit and CSI_OUT too */ 466 /* Everything is two's complement, soft bit and CSI_OUT too */
464 l64781_writereg (state, 0x1e, 0x09); 467 l64781_writereg (state, 0x1e, 0x09);
465 468
466 if (state->config->pll_init) state->config->pll_init(fe);
467
468 /* delay a bit after first init attempt */ 469 /* delay a bit after first init attempt */
469 if (state->first) { 470 if (state->first) {
470 state->first = 0; 471 state->first = 0;
diff --git a/drivers/media/dvb/frontends/l64781.h b/drivers/media/dvb/frontends/l64781.h
index 947f65f87465..83b8bc210274 100644
--- a/drivers/media/dvb/frontends/l64781.h
+++ b/drivers/media/dvb/frontends/l64781.h
@@ -29,10 +29,6 @@ struct l64781_config
29{ 29{
30 /* the demodulator's i2c address */ 30 /* the demodulator's i2c address */
31 u8 demod_address; 31 u8 demod_address;
32
33 /* PLL maintenance */
34 int (*pll_init)(struct dvb_frontend* fe);
35 int (*pll_set)(struct dvb_frontend* fe, struct dvb_frontend_parameters* params);
36}; 32};
37 33
38 34