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/nxt200x.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/nxt200x.c')
| -rw-r--r-- | linux/drivers/media/dvb/frontends/nxt200x.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/linux/drivers/media/dvb/frontends/nxt200x.c b/linux/drivers/media/dvb/frontends/nxt200x.c index 9b13f14f1..55671cb52 100644 --- a/linux/drivers/media/dvb/frontends/nxt200x.c +++ b/linux/drivers/media/dvb/frontends/nxt200x.c @@ -55,7 +55,6 @@ struct nxt200x_state { struct i2c_adapter* i2c; - struct dvb_frontend_ops ops; const struct nxt200x_config* config; struct dvb_frontend frontend; @@ -548,8 +547,8 @@ static int nxt200x_setup_frontend_parameters (struct dvb_frontend* fe, } /* get tuning information */ - if (fe->ops->tuner_ops.calc_regs) { - fe->ops->tuner_ops.calc_regs(fe, p, buf, 5); + if (fe->ops.tuner_ops.calc_regs) { + fe->ops.tuner_ops.calc_regs(fe, p, buf, 5); } /* set additional params */ @@ -1161,7 +1160,6 @@ struct dvb_frontend* nxt200x_attach(const struct nxt200x_config* config, /* setup the state */ state->config = config; state->i2c = i2c; - memcpy(&state->ops, &nxt200x_ops, sizeof(struct dvb_frontend_ops)); state->initialised = 0; /* read card id */ @@ -1200,7 +1198,7 @@ struct dvb_frontend* nxt200x_attach(const struct nxt200x_config* config, } /* create dvb_frontend */ - state->frontend.ops = &state->ops; + memcpy(&state->frontend.ops, &nxt200x_ops, sizeof(struct dvb_frontend_ops)); state->frontend.demodulator_priv = state; return &state->frontend; |