diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-05-19 12:00:12 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-05-19 12:00:12 -0300 |
| commit | f768c8f3a921624366296efddaecf6f962ecdbe8 (patch) | |
| tree | ab058b2f535c1c746ccd3faf753e28fdb8e808b9 /linux/drivers/media/dvb/frontends/l64781.c | |
| parent | 7b2b6e9be7a9c4c8ba356cfed999b6283579c7ae (diff) | |
| parent | 8bf2cc99d48eabe83872a51ceb427ea64cff7207 (diff) | |
| download | mediapointer-dvb-s2-f768c8f3a921624366296efddaecf6f962ecdbe8.tar.gz mediapointer-dvb-s2-f768c8f3a921624366296efddaecf6f962ecdbe8.tar.bz2 | |
merge: http://linuxtv.org/hg/~quincy/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/dvb/frontends/l64781.c')
| -rw-r--r-- | linux/drivers/media/dvb/frontends/l64781.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/linux/drivers/media/dvb/frontends/l64781.c b/linux/drivers/media/dvb/frontends/l64781.c index fa4a87e00..f3bc82e44 100644 --- a/linux/drivers/media/dvb/frontends/l64781.c +++ b/linux/drivers/media/dvb/frontends/l64781.c @@ -32,7 +32,6 @@ struct l64781_state { struct i2c_adapter* i2c; - struct dvb_frontend_ops ops; const struct l64781_config* config; struct dvb_frontend frontend; @@ -141,9 +140,9 @@ static int apply_frontend_param (struct dvb_frontend* fe, struct dvb_frontend_pa u8 val0x06; int bw = p->bandwidth - BANDWIDTH_8_MHZ; - if (fe->ops->tuner_ops.set_params) { - fe->ops->tuner_ops.set_params(fe, param); - if (fe->ops->i2c_gate_ctrl) fe->ops->i2c_gate_ctrl(fe, 0); + if (fe->ops.tuner_ops.set_params) { + fe->ops.tuner_ops.set_params(fe, param); + if (fe->ops.i2c_gate_ctrl) fe->ops.i2c_gate_ctrl(fe, 0); } if (param->inversion != INVERSION_ON && @@ -509,7 +508,6 @@ struct dvb_frontend* l64781_attach(const struct l64781_config* config, /* setup the state */ state->config = config; state->i2c = i2c; - memcpy(&state->ops, &l64781_ops, sizeof(struct dvb_frontend_ops)); state->first = 1; /** @@ -555,7 +553,7 @@ struct dvb_frontend* l64781_attach(const struct l64781_config* config, } /* create dvb_frontend */ - state->frontend.ops = &state->ops; + memcpy(&state->frontend.ops, &l64781_ops, sizeof(struct dvb_frontend_ops)); state->frontend.demodulator_priv = state; return &state->frontend; |