Skip to content

Commit

Permalink
V4L/DVB (4027): Fixes after dvb_tuner_ops-conversion
Browse files Browse the repository at this point in the history 
Some of the dvb_tuner_ops-pointer were set before having a dvb_frontend creating.

Signed-off-by: Patrick Boettcher <pb@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
  • Loading branch information
Patrick Boettcher authored and Mauro Carvalho Chehab committed Jun 25, 2006
1 parent 2938d78 commit 332bed5
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 16 deletions.
31 changes: 18 additions & 13 deletions drivers/media/dvb/dvb-usb/cxusb.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -359,27 +359,40 @@ static int cxusb_fmd1216me_tuner_attach(struct dvb_usb_device *d)
d->pll_addr = 0x61;
memcpy(d->pll_init, bpll, 4);
d->pll_desc = &dvb_pll_fmd1216me;

d->fe->ops->tuner_ops.init = dvb_usb_tuner_init_i2c;
d->fe->ops->tuner_ops.set_params = dvb_usb_tuner_set_params_i2c;

return 0;
}

static int cxusb_dee1601_tuner_attach(struct dvb_usb_device *d)
{
d->pll_addr = 0x61;
d->pll_desc = &dvb_pll_thomson_dtt7579;
d->fe->ops->tuner_ops.calc_regs = dvb_usb_tuner_calc_regs;
return 0;
}

static int cxusb_lgz201_tuner_attach(struct dvb_usb_device *d)
{
d->pll_addr = 0x61;
d->pll_desc = &dvb_pll_lg_z201;
d->fe->ops->tuner_ops.calc_regs = dvb_usb_tuner_calc_regs;
return 0;
}

static int cxusb_dtt7579_tuner_attach(struct dvb_usb_device *d)
{
d->pll_addr = 0x60;
d->pll_desc = &dvb_pll_thomson_dtt7579;
d->fe->ops->tuner_ops.calc_regs = dvb_usb_tuner_calc_regs;
return 0;
}

static int cxusb_lgdt3303_tuner_attach(struct dvb_usb_device *d)
{
d->fe->ops->tuner_ops.set_params = cxusb_lgh064f_tuner_set_params;
return 0;
}

Expand All @@ -391,11 +404,8 @@ static int cxusb_cx22702_frontend_attach(struct dvb_usb_device *d)

cxusb_ctrl_msg(d,CMD_DIGITAL, NULL, 0, &b, 1);

if ((d->fe = cx22702_attach(&cxusb_cx22702_config, &d->i2c_adap)) != 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;
if ((d->fe = cx22702_attach(&cxusb_cx22702_config, &d->i2c_adap)) != NULL)
return 0;
}

return -EIO;
}
Expand All @@ -407,10 +417,8 @@ static int cxusb_lgdt3303_frontend_attach(struct dvb_usb_device *d)

cxusb_ctrl_msg(d,CMD_DIGITAL, NULL, 0, NULL, 0);

if ((d->fe = lgdt330x_attach(&cxusb_lgdt3303_config, &d->i2c_adap)) != NULL) {
d->fe->ops->tuner_ops.set_params = cxusb_lgh064f_tuner_set_params;
if ((d->fe = lgdt330x_attach(&cxusb_lgdt3303_config, &d->i2c_adap)) != NULL)
return 0;
}

return -EIO;
}
Expand All @@ -422,10 +430,8 @@ static int cxusb_mt352_frontend_attach(struct dvb_usb_device *d)

cxusb_ctrl_msg(d,CMD_DIGITAL, NULL, 0, NULL, 0);

if ((d->fe = mt352_attach(&cxusb_mt352_config, &d->i2c_adap)) != NULL) {
d->fe->ops->tuner_ops.calc_regs = dvb_usb_tuner_calc_regs;
if ((d->fe = mt352_attach(&cxusb_mt352_config, &d->i2c_adap)) != NULL)
return 0;
}

return -EIO;
}
Expand All @@ -437,10 +443,8 @@ static int cxusb_dee1601_frontend_attach(struct dvb_usb_device *d)

cxusb_ctrl_msg(d,CMD_DIGITAL, NULL, 0, NULL, 0);

if ((d->fe = mt352_attach(&cxusb_dee1601_config, &d->i2c_adap)) != NULL) {
d->fe->ops->tuner_ops.calc_regs = dvb_usb_tuner_calc_regs;
if ((d->fe = mt352_attach(&cxusb_dee1601_config, &d->i2c_adap)) != NULL)
return 0;
}

return -EIO;
}
Expand Down Expand Up @@ -555,6 +559,7 @@ static struct dvb_usb_properties cxusb_bluebird_lgh064f_properties = {
.streaming_ctrl = cxusb_streaming_ctrl,
.power_ctrl = cxusb_bluebird_power_ctrl,
.frontend_attach = cxusb_lgdt3303_frontend_attach,
.tuner_attach = cxusb_lgdt3303_tuner_attach,

.i2c_algo = &cxusb_i2c_algo,

Expand Down
8 changes: 6 additions & 2 deletions drivers/media/dvb/dvb-usb/dibusb-common.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand All @@ -189,6 +189,10 @@ int dibusb_dib3000mc_tuner_attach (struct dvb_usb_device *d)
{
d->pll_addr = 0x60;
d->pll_desc = &dvb_pll_env57h1xd5;

d->fe->ops.tuner_ops.init = dvb_usb_tuner_init_i2c;
d->fe->ops.tuner_ops.set_params = dvb_usb_tuner_set_params_i2c;

return 0;
}
EXPORT_SYMBOL(dibusb_dib3000mc_tuner_attach);
Expand Down
2 changes: 1 addition & 1 deletion drivers/media/dvb/dvb-usb/umt-010.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@ static int umt_mt352_frontend_attach(struct dvb_usb_device *d)
memset(&umt_config,0,sizeof(struct mt352_config));
umt_config.demod_init = umt_mt352_demod_init;
umt_config.demod_address = 0xf;
d->fe->ops->tuner_ops.calc_regs = dvb_usb_tuner_calc_regs;

d->fe = mt352_attach(&umt_config, &d->i2c_adap);

Expand All @@ -68,6 +67,7 @@ static int umt_tuner_attach (struct dvb_usb_device *d)
{
d->pll_addr = 0x61;
d->pll_desc = &dvb_pll_tua6034;
d->fe->ops->tuner_ops.calc_regs = dvb_usb_tuner_calc_regs;
return 0;
}

Expand Down

0 comments on commit 332bed5

Please sign in to comment.