diff options
Diffstat (limited to 'drivers/media/dvb/frontends/nxt200x.c')
-rw-r--r-- | drivers/media/dvb/frontends/nxt200x.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/media/dvb/frontends/nxt200x.c b/drivers/media/dvb/frontends/nxt200x.c index 9b13f14f14f6..55671cb5255e 100644 --- a/drivers/media/dvb/frontends/nxt200x.c +++ b/drivers/media/dvb/frontends/nxt200x.c | |||
@@ -55,7 +55,6 @@ | |||
55 | struct nxt200x_state { | 55 | struct nxt200x_state { |
56 | 56 | ||
57 | struct i2c_adapter* i2c; | 57 | struct i2c_adapter* i2c; |
58 | struct dvb_frontend_ops ops; | ||
59 | const struct nxt200x_config* config; | 58 | const struct nxt200x_config* config; |
60 | struct dvb_frontend frontend; | 59 | struct dvb_frontend frontend; |
61 | 60 | ||
@@ -548,8 +547,8 @@ static int nxt200x_setup_frontend_parameters (struct dvb_frontend* fe, | |||
548 | } | 547 | } |
549 | 548 | ||
550 | /* get tuning information */ | 549 | /* get tuning information */ |
551 | if (fe->ops->tuner_ops.calc_regs) { | 550 | if (fe->ops.tuner_ops.calc_regs) { |
552 | fe->ops->tuner_ops.calc_regs(fe, p, buf, 5); | 551 | fe->ops.tuner_ops.calc_regs(fe, p, buf, 5); |
553 | } | 552 | } |
554 | 553 | ||
555 | /* set additional params */ | 554 | /* set additional params */ |
@@ -1161,7 +1160,6 @@ struct dvb_frontend* nxt200x_attach(const struct nxt200x_config* config, | |||
1161 | /* setup the state */ | 1160 | /* setup the state */ |
1162 | state->config = config; | 1161 | state->config = config; |
1163 | state->i2c = i2c; | 1162 | state->i2c = i2c; |
1164 | memcpy(&state->ops, &nxt200x_ops, sizeof(struct dvb_frontend_ops)); | ||
1165 | state->initialised = 0; | 1163 | state->initialised = 0; |
1166 | 1164 | ||
1167 | /* read card id */ | 1165 | /* read card id */ |
@@ -1200,7 +1198,7 @@ struct dvb_frontend* nxt200x_attach(const struct nxt200x_config* config, | |||
1200 | } | 1198 | } |
1201 | 1199 | ||
1202 | /* create dvb_frontend */ | 1200 | /* create dvb_frontend */ |
1203 | state->frontend.ops = &state->ops; | 1201 | memcpy(&state->frontend.ops, &nxt200x_ops, sizeof(struct dvb_frontend_ops)); |
1204 | state->frontend.demodulator_priv = state; | 1202 | state->frontend.demodulator_priv = state; |
1205 | return &state->frontend; | 1203 | return &state->frontend; |
1206 | 1204 | ||