diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-05-19 12:08:47 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-05-19 12:08:47 -0300 |
| commit | 4cac5256e71021e5bd26eff40f465a6f41fe4b1a (patch) | |
| tree | fc4404c714ea4579b950e4b783c6ab5b14427d50 /linux/drivers/media | |
| parent | f768c8f3a921624366296efddaecf6f962ecdbe8 (diff) | |
| download | mediapointer-dvb-s2-4cac5256e71021e5bd26eff40f465a6f41fe4b1a.tar.gz mediapointer-dvb-s2-4cac5256e71021e5bd26eff40f465a6f41fe4b1a.tar.bz2 | |
Fix broken DVB drivers caused by a recent merge
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media')
| -rw-r--r-- | linux/drivers/media/dvb/dvb-usb/dibusb-common.c | 4 | ||||
| -rw-r--r-- | linux/drivers/media/dvb/frontends/mt352.c | 8 | ||||
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-dvb.c | 4 | ||||
| -rw-r--r-- | linux/drivers/media/video/saa7134/saa7134-dvb.c | 2 |
4 files changed, 9 insertions, 9 deletions
diff --git a/linux/drivers/media/dvb/dvb-usb/dibusb-common.c b/linux/drivers/media/dvb/dvb-usb/dibusb-common.c index 442208b92..abd75b4a3 100644 --- a/linux/drivers/media/dvb/dvb-usb/dibusb-common.c +++ b/linux/drivers/media/dvb/dvb-usb/dibusb-common.c @@ -175,8 +175,8 @@ int dibusb_dib3000mc_frontend_attach(struct dvb_usb_device *d) for (demod_cfg.demod_address = 0x8; demod_cfg.demod_address < 0xd; demod_cfg.demod_address++) if ((d->fe = dib3000mc_attach(&demod_cfg,&d->i2c_adap,&st->ops)) != NULL) { - d->fe->ops->tuner_ops.init = dvb_usb_tuner_init_i2c; - d->fe->ops->tuner_ops.set_params = dvb_usb_tuner_set_params_i2c; + d->fe->ops.tuner_ops.init = dvb_usb_tuner_init_i2c; + d->fe->ops.tuner_ops.set_params = dvb_usb_tuner_set_params_i2c; d->tuner_pass_ctrl = st->ops.tuner_pass_ctrl; return 0; } diff --git a/linux/drivers/media/dvb/frontends/mt352.c b/linux/drivers/media/dvb/frontends/mt352.c index abd638349..5de7376c9 100644 --- a/linux/drivers/media/dvb/frontends/mt352.c +++ b/linux/drivers/media/dvb/frontends/mt352.c @@ -289,15 +289,15 @@ static int mt352_set_parameters(struct dvb_frontend* fe, if (state->config.no_tuner) { 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.i2c_gate_ctrl) + fe->ops.i2c_gate_ctrl(fe, 0); } mt352_write(fe, buf, 8); mt352_write(fe, fsm_go, 2); } else { - if (fe->ops->tuner_ops.calc_regs) { - fe->ops->tuner_ops.calc_regs(fe, param, buf+8, 5); + if (fe->ops.tuner_ops.calc_regs) { + fe->ops.tuner_ops.calc_regs(fe, param, buf+8, 5); buf[8] <<= 1; mt352_write(fe, buf, sizeof(buf)); mt352_write(fe, tuner_go, 2); diff --git a/linux/drivers/media/video/cx88/cx88-dvb.c b/linux/drivers/media/video/cx88/cx88-dvb.c index 8fd03540b..bea7b4c1b 100644 --- a/linux/drivers/media/video/cx88/cx88-dvb.c +++ b/linux/drivers/media/video/cx88/cx88-dvb.c @@ -722,8 +722,8 @@ static int dvb_register(struct cx8802_dev *dev) dev->dvb.frontend = cx24123_attach(&kworld_dvbs_100_config, &dev->core->i2c_adap); if (dev->dvb.frontend) { - dev->core->prev_set_voltage = dev->dvb.frontend->ops->set_voltage; - dev->dvb.frontend->ops->set_voltage = kworld_dvbs_100_set_voltage; + dev->core->prev_set_voltage = dev->dvb.frontend->ops.set_voltage; + dev->dvb.frontend->ops.set_voltage = kworld_dvbs_100_set_voltage; } break; #endif diff --git a/linux/drivers/media/video/saa7134/saa7134-dvb.c b/linux/drivers/media/video/saa7134/saa7134-dvb.c index bb5c5c58e..c8a28694e 100644 --- a/linux/drivers/media/video/saa7134/saa7134-dvb.c +++ b/linux/drivers/media/video/saa7134/saa7134-dvb.c @@ -1016,7 +1016,7 @@ static int dvb_init(struct saa7134_dev *dev) dev->dvb.frontend = mt352_attach(&pinnacle_300i, &dev->i2c_adap); if (dev->dvb.frontend) { - dev->dvb.frontend->ops->tuner_ops.set_params = mt352_pinnacle_tuner_set_params; + dev->dvb.frontend->ops.tuner_ops.set_params = mt352_pinnacle_tuner_set_params; } break; |