From: Antti Palosaari Date: Tue, 4 Nov 2014 00:23:26 +0000 (-0300) Subject: [media] af9033: improve read_signal_strength error handling slightly X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=1620d221842cb2445680be2afbb36272350b4cac;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git [media] af9033: improve read_signal_strength error handling slightly Check return status after each register access routine and avoid masking return status values. Signed-off-by: Antti Palosaari Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/media/dvb-frontends/af9033.c b/drivers/media/dvb-frontends/af9033.c index e3bae7737874..3f688dea9f07 100644 --- a/drivers/media/dvb-frontends/af9033.c +++ b/drivers/media/dvb-frontends/af9033.c @@ -876,7 +876,12 @@ static int af9033_read_signal_strength(struct dvb_frontend *fe, u16 *strength) *strength = u8tmp * 0xffff / 100; } else { ret = af9033_rd_reg(dev, 0x8000f7, &u8tmp); - ret |= af9033_rd_regs(dev, 0x80f900, buf, 7); + if (ret < 0) + goto err; + + ret = af9033_rd_regs(dev, 0x80f900, buf, 7); + if (ret < 0) + goto err; if (c->frequency <= 300000000) gain_offset = 7; /* VHF */ @@ -901,9 +906,6 @@ static int af9033_read_signal_strength(struct dvb_frontend *fe, u16 *strength) *strength = tmp * 0xffff / 100; } - if (ret) - goto err; - return 0; err: