mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-05 08:26:59 +00:00
Code Issues Releases Wiki Activity

media: xc5000: better handle I2C error messages

Browse source 
As warned by smatch, there are several places where the I2C
transfer may fail, leading into inconsistent behavior:

	drivers/media/tuners/xc5000.c:689 xc_debug_dump() error: uninitialized symbol 'regval'.
	drivers/media/tuners/xc5000.c:841 xc5000_is_firmware_loaded() error: uninitialized symbol 'id'.
	drivers/media/tuners/xc5000.c:939 xc5000_set_tv_freq() error: uninitialized symbol 'pll_lock_status'.
	drivers/media/tuners/xc5000.c:1195 xc_load_fw_and_init_tuner() error: uninitialized symbol 'pll_lock_status'.

Handle the return codes from the I2C transfer, in order to
address those issues.

Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
This commit is contained in:
Mauro Carvalho Chehab 2017-11-01 17:05:43 -04:00
parent ad7b57d58d
commit 7621b8c4c0
1 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
drivers/media/tuners/xc5000.c
View file

@ -685,8 +685,8 @@ static void xc_debug_dump(struct xc5000_priv *priv)
(totalgain % 256) * 100 / 256);
if (priv->pll_register_no) {
xc5000_readreg(priv, priv->pll_register_no, &regval);
dprintk(1, "*** PLL lock status = 0x%04x\n", regval);
if (!xc5000_readreg(priv, priv->pll_register_no, &regval))
dprintk(1, "*** PLL lock status = 0x%04x\n", regval);
}
}
@ -831,15 +831,16 @@ static int xc5000_is_firmware_loaded(struct dvb_frontend *fe)
u16 id;
ret = xc5000_readreg(priv, XREG_PRODUCT_ID, &id);
if (ret == 0) {
if (!ret) {
if (id == XC_PRODUCT_ID_FW_NOT_LOADED)
ret = -ENOENT;
else
ret = 0;
dprintk(1, "%s() returns id = 0x%x\n", __func__, id);
} else {
dprintk(1, "%s() returns error %d\n", __func__, ret);
}
dprintk(1, "%s() returns %s id = 0x%x\n", __func__,
ret == 0 ? "True" : "False", id);
return ret;
}
@ -935,7 +936,10 @@ static int xc5000_set_tv_freq(struct dvb_frontend *fe)
if (priv->pll_register_no != 0) {
msleep(20);
xc5000_readreg(priv, priv->pll_register_no, &pll_lock_status);
ret = xc5000_readreg(priv, priv->pll_register_no,
&pll_lock_status);
if (ret)
return ret;
if (pll_lock_status > 63) {
/* PLL is unlocked, force reload of the firmware */
dprintk(1, "xc5000: PLL not locked (0x%x). Reloading...\n",
@ -1190,8 +1194,10 @@ static int xc_load_fw_and_init_tuner(struct dvb_frontend *fe, int force)
}
if (priv->pll_register_no) {
xc5000_readreg(priv, priv->pll_register_no,
&pll_lock_status);
ret = xc5000_readreg(priv, priv->pll_register_no,
&pll_lock_status);
if (ret)
continue;
if (pll_lock_status > 63) {
/* PLL is unlocked, force reload of the firmware */
printk(KERN_ERR