]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
[media] ov7670: check read error also for REG_AECHH on ov7670_s_exp()
authorMauro Carvalho Chehab <mchehab@osg.samsung.com>
Wed, 29 Apr 2015 12:50:41 +0000 (09:50 -0300)
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>
Fri, 1 May 2015 09:06:13 +0000 (06:06 -0300)
ov7670_s_exp() checks read error for 2 registers: REG_COM1
and REG_COM8. But, although it uses the value latter, it
doesn't check errors on REG_AECHH read. Yet, as it is doing
a bitmask operation there, the read operation should succeed.

So, fix the code to also check if this succeeded.

This fixes this smatch report:
drivers/media/i2c/ov7670.c:1366 ov7670_s_exp() warn: inconsistent indenting

Compile-tested only.

Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Acked-by: Jonathan Corbet <corbet@lwn.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
drivers/media/i2c/ov7670.c

index b9847527eb5a3866965b1f15d21be96c8c96f3ad..f2fe20aad274b2fa4194c27dd57158d9cd2c3138 100644 (file)
@@ -1362,7 +1362,7 @@ static int ov7670_s_exp(struct v4l2_subdev *sd, int value)
        unsigned char com1, com8, aech, aechh;
 
        ret = ov7670_read(sd, REG_COM1, &com1) +
-               ov7670_read(sd, REG_COM8, &com8);
+               ov7670_read(sd, REG_COM8, &com8) +
                ov7670_read(sd, REG_AECHH, &aechh);
        if (ret)
                return ret;