iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[media] tda18212: tda18218: use 'val' if initialized

Browse Source 
Commits e666a44fa3 ("[media] tda18212:
silence compiler warning") and e0e52d4e9f
("[media] tda18218: silence compiler warning") silenced warnings
equivalent to these:
    drivers/media/tuners/tda18212.c: In function ‘tda18212_attach’:
    drivers/media/tuners/tda18212.c:299:2: warning: ‘val’ may be used uninitialized in this function [-Wmaybe-uninitialized]
    drivers/media/tuners/tda18218.c: In function ‘tda18218_attach’:
    drivers/media/tuners/tda18218.c:305:2: warning: ‘val’ may be used uninitialized in this function [-Wmaybe-uninitialized]
But in both cases 'val' will still be used uninitialized if the calls
of tda18212_rd_reg() or tda18218_rd_reg() fail. Fix this by only
printing the "chip id" if the calls of those functions were successful.
This allows to drop the uninitialized_var() stopgap measure.
Also stop printing the return values of tda18212_rd_reg() or
tda18218_rd_reg(), as these are not interesting.

Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
Acked-by: Antti Palosaari <crope@iki.fi>
Reviewed-by: Antti Palosaari <crope@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Paul Bolle 2012-11-01 17:00:09 -03:00 committed by Mauro Carvalho Chehab
parent cb31c74875
commit ed2e330114
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/media/tuners/tda18212.c
View File

@ -277,7 +277,7 @@ struct dvb_frontend *tda18212_attach(struct dvb_frontend *fe,
{ {
struct tda18212_priv *priv = NULL; struct tda18212_priv *priv = NULL;
int ret; int ret;
u8 uninitialized_var(val); u8 val;
priv = kzalloc(sizeof(struct tda18212_priv), GFP_KERNEL); priv = kzalloc(sizeof(struct tda18212_priv), GFP_KERNEL);
if (priv == NULL) if (priv == NULL)
@ -296,8 +296,8 @@ struct dvb_frontend *tda18212_attach(struct dvb_frontend *fe,
if (fe->ops.i2c_gate_ctrl) if (fe->ops.i2c_gate_ctrl)
fe->ops.i2c_gate_ctrl(fe, 0); /* close I2C-gate */ fe->ops.i2c_gate_ctrl(fe, 0); /* close I2C-gate */
dev_dbg(&priv->i2c->dev, "%s: ret=%d chip id=%02x\n", __func__, ret, if (!ret)
val); dev_dbg(&priv->i2c->dev, "%s: chip id=%02x\n", __func__, val);
if (ret || val != 0xc7) { if (ret || val != 0xc7) {
kfree(priv); kfree(priv);
return NULL; return NULL;

6
drivers/media/tuners/tda18218.c
View File

@ -277,7 +277,7 @@ struct dvb_frontend *tda18218_attach(struct dvb_frontend *fe,
struct i2c_adapter *i2c, struct tda18218_config *cfg) struct i2c_adapter *i2c, struct tda18218_config *cfg)
{ {
struct tda18218_priv *priv = NULL; struct tda18218_priv *priv = NULL;
u8 uninitialized_var(val); u8 val;
int ret; int ret;
/* chip default registers values */ /* chip default registers values */
static u8 def_regs[] = { static u8 def_regs[] = {
@ -302,8 +302,8 @@ struct dvb_frontend *tda18218_attach(struct dvb_frontend *fe,
/* check if the tuner is there */ /* check if the tuner is there */
ret = tda18218_rd_reg(priv, R00_ID, &val); ret = tda18218_rd_reg(priv, R00_ID, &val);
dev_dbg(&priv->i2c->dev, "%s: ret=%d chip id=%02x\n", __func__, ret, if (!ret)
val); dev_dbg(&priv->i2c->dev, "%s: chip id=%02x\n", __func__, val);
if (ret || val != def_regs[R00_ID]) { if (ret || val != def_regs[R00_ID]) {
kfree(priv); kfree(priv);
return NULL; return NULL;