diff options
Diffstat (limited to 'drivers/media/dvb/frontends/cx22702.c')
-rw-r--r-- | drivers/media/dvb/frontends/cx22702.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/drivers/media/dvb/frontends/cx22702.c b/drivers/media/dvb/frontends/cx22702.c index a129fc9cba30..4106d46c957f 100644 --- a/drivers/media/dvb/frontends/cx22702.c +++ b/drivers/media/dvb/frontends/cx22702.c | |||
@@ -40,8 +40,6 @@ struct cx22702_state { | |||
40 | 40 | ||
41 | struct i2c_adapter* i2c; | 41 | struct i2c_adapter* i2c; |
42 | 42 | ||
43 | struct dvb_frontend_ops ops; | ||
44 | |||
45 | /* configuration settings */ | 43 | /* configuration settings */ |
46 | const struct cx22702_config* config; | 44 | const struct cx22702_config* config; |
47 | 45 | ||
@@ -211,9 +209,9 @@ static int cx22702_set_tps (struct dvb_frontend* fe, struct dvb_frontend_paramet | |||
211 | u8 val; | 209 | u8 val; |
212 | struct cx22702_state* state = fe->demodulator_priv; | 210 | struct cx22702_state* state = fe->demodulator_priv; |
213 | 211 | ||
214 | if (fe->ops->tuner_ops.set_params) { | 212 | if (fe->ops.tuner_ops.set_params) { |
215 | fe->ops->tuner_ops.set_params(fe, p); | 213 | fe->ops.tuner_ops.set_params(fe, p); |
216 | if (fe->ops->i2c_gate_ctrl) fe->ops->i2c_gate_ctrl(fe, 0); | 214 | if (fe->ops.i2c_gate_ctrl) fe->ops.i2c_gate_ctrl(fe, 0); |
217 | } | 215 | } |
218 | 216 | ||
219 | /* set inversion */ | 217 | /* set inversion */ |
@@ -479,7 +477,6 @@ struct dvb_frontend* cx22702_attach(const struct cx22702_config* config, | |||
479 | /* setup the state */ | 477 | /* setup the state */ |
480 | state->config = config; | 478 | state->config = config; |
481 | state->i2c = i2c; | 479 | state->i2c = i2c; |
482 | memcpy(&state->ops, &cx22702_ops, sizeof(struct dvb_frontend_ops)); | ||
483 | state->prevUCBlocks = 0; | 480 | state->prevUCBlocks = 0; |
484 | 481 | ||
485 | /* check if the demod is there */ | 482 | /* check if the demod is there */ |
@@ -487,7 +484,7 @@ struct dvb_frontend* cx22702_attach(const struct cx22702_config* config, | |||
487 | goto error; | 484 | goto error; |
488 | 485 | ||
489 | /* create dvb_frontend */ | 486 | /* create dvb_frontend */ |
490 | state->frontend.ops = &state->ops; | 487 | memcpy(&state->frontend.ops, &cx22702_ops, sizeof(struct dvb_frontend_ops)); |
491 | state->frontend.demodulator_priv = state; | 488 | state->frontend.demodulator_priv = state; |
492 | return &state->frontend; | 489 | return &state->frontend; |
493 | 490 | ||