nagai/kernel
3
0
Fork 0
forked from mirrors/linux
Code Pull requests Activity

[media] tda10071: make sure both tuner and demod i2c addresses are specified

Browse source 
display an error message if either tuner_i2c_addr or demod_i2c_addr
are not specified in the tda10071_config structure

Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Michael Krufky 2012-12-16 19:37:11 -03:00 committed by Mauro Carvalho Chehab
parent bb9e31f392
commit 41f55d5755
4 changed files with 20 additions and 7 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

18
drivers/media/dvb-frontends/tda10071.c
View file

@ -30,7 +30,7 @@ static int tda10071_wr_regs(struct tda10071_priv *priv, u8 reg, u8 *val,
u8 buf[len+1]; u8 buf[len+1];
struct i2c_msg msg[1] = { struct i2c_msg msg[1] = {
{ {
.addr = priv->cfg.i2c_address, .addr = priv->cfg.demod_i2c_addr,
.flags = 0, .flags = 0,
.len = sizeof(buf), .len = sizeof(buf),
.buf = buf, .buf = buf,
@ -59,12 +59,12 @@ static int tda10071_rd_regs(struct tda10071_priv *priv, u8 reg, u8 *val,
u8 buf[len]; u8 buf[len];
struct i2c_msg msg[2] = { struct i2c_msg msg[2] = {
{ {
.addr = priv->cfg.i2c_address, .addr = priv->cfg.demod_i2c_addr,
.flags = 0, .flags = 0,
.len = 1, .len = 1,
.buf = &reg, .buf = &reg,
}, { }, {
.addr = priv->cfg.i2c_address, .addr = priv->cfg.demod_i2c_addr,
.flags = I2C_M_RD, .flags = I2C_M_RD,
.len = sizeof(buf), .len = sizeof(buf),
.buf = buf, .buf = buf,
@ -1202,6 +1202,18 @@ struct dvb_frontend *tda10071_attach(const struct tda10071_config *config,
goto error; goto error;
} }
/* make sure demod i2c address is specified */
if (!config->demod_i2c_addr) {
dev_dbg(&i2c->dev, "%s: invalid demod i2c address!\n", __func__);
goto error;
}
/* make sure tuner i2c address is specified */
if (!config->tuner_i2c_addr) {
dev_dbg(&i2c->dev, "%s: invalid tuner i2c address!\n", __func__);
goto error;
}
/* setup the priv */ /* setup the priv */
priv->i2c = i2c; priv->i2c = i2c;
memcpy(&priv->cfg, config, sizeof(struct tda10071_config)); memcpy(&priv->cfg, config, sizeof(struct tda10071_config));

4
drivers/media/dvb-frontends/tda10071.h
View file

@ -28,10 +28,10 @@ struct tda10071_config {
* Default: none, must set * Default: none, must set
* Values: 0x55, * Values: 0x55,
*/ */
u8 i2c_address; u8 demod_i2c_addr;
/* Tuner I2C address. /* Tuner I2C address.
* Default: 0x14 * Default: none, must set
* Values: 0x14, 0x54, ... * Values: 0x14, 0x54, ...
*/ */
u8 tuner_i2c_addr; u8 tuner_i2c_addr;

2
drivers/media/pci/cx23885/cx23885-dvb.c
View file

@ -662,7 +662,7 @@ static struct mt2063_config terratec_mt2063_config[] = {
}; };
static const struct tda10071_config hauppauge_tda10071_config = { static const struct tda10071_config hauppauge_tda10071_config = {
.i2c_address = 0x05, .demod_i2c_addr = 0x05,
.tuner_i2c_addr = 0x54, .tuner_i2c_addr = 0x54,
.i2c_wr_max = 64, .i2c_wr_max = 64,
.ts_mode = TDA10071_TS_SERIAL, .ts_mode = TDA10071_TS_SERIAL,

3
drivers/media/usb/em28xx/em28xx-dvb.c
View file

@ -714,7 +714,8 @@ static struct tda18271_config em28xx_cxd2820r_tda18271_config = {
}; };
static const struct tda10071_config em28xx_tda10071_config = { static const struct tda10071_config em28xx_tda10071_config = {
.i2c_address = 0x55, /* (0xaa >> 1) */ .demod_i2c_addr = 0x55, /* (0xaa >> 1) */
.tuner_i2c_addr = 0x14,
.i2c_wr_max = 64, .i2c_wr_max = 64,
.ts_mode = TDA10071_TS_SERIAL, .ts_mode = TDA10071_TS_SERIAL,
.spec_inv = 0, .spec_inv = 0,