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/at76c651.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/at76c651.c')
| -rw-r--r-- | linux/drivers/media/dvb/frontends/at76c651.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/linux/drivers/media/dvb/frontends/at76c651.c b/linux/drivers/media/dvb/frontends/at76c651.c index 556689a80..600462b70 100644 --- a/linux/drivers/media/dvb/frontends/at76c651.c +++ b/linux/drivers/media/dvb/frontends/at76c651.c @@ -41,8 +41,6 @@ struct at76c651_state { struct i2c_adapter* i2c; - struct dvb_frontend_ops ops; - const struct at76c651_config* config; struct dvb_frontend frontend; @@ -246,9 +244,9 @@ static int at76c651_set_parameters(struct dvb_frontend* fe, int ret; struct at76c651_state* state = fe->demodulator_priv; - if (fe->ops->tuner_ops.set_params) { - fe->ops->tuner_ops.set_params(fe, p); - 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, p); + if (fe->ops.i2c_gate_ctrl) fe->ops.i2c_gate_ctrl(fe, 0); } if ((ret = at76c651_set_symbol_rate(state, p->u.qam.symbol_rate))) @@ -385,10 +383,9 @@ struct dvb_frontend* at76c651_attach(const struct at76c651_config* config, /* finalise state setup */ state->i2c = i2c; state->revision = at76c651_readreg(state, 0x0f) & 0xfe; - memcpy(&state->ops, &at76c651_ops, sizeof(struct dvb_frontend_ops)); /* create dvb_frontend */ - state->frontend.ops = &state->ops; + memcpy(&state->frontend.ops, &at76c651_ops, sizeof(struct dvb_frontend_ops)); state->frontend.demodulator_priv = state; return &state->frontend; |