summary refs log tree commit diff
path: root/drivers/media/i2c/sr030pc30.c
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2018-08-31 09:20:18 -0400
committerMauro Carvalho Chehab <mchehab+samsung@kernel.org>2018-09-17 15:19:10 -0400
commit75b090a5bc961e578e232269596ddd0486ec6fca (patch)
tree826f0d73751046629f1d6a95a075ff921e7424bd /drivers/media/i2c/sr030pc30.c
parent7d3073f13ea85a1e8b868502fa6735696a629060 (diff)
downloadlinux-75b090a5bc961e578e232269596ddd0486ec6fca.tar.gz
media: sr030pc30: remove NULL in sr030pc30_base_config()
This code doesn't check for NULL consistently and it generates a Smatch
warning:

    drivers/media/i2c/sr030pc30.c:575 sr030pc30_base_config()
    error: we previously assumed 'info->pdata' could be null (see line 572)

Fortunately, "info->pdata" can't be NULL to that check can be removed.
The other thing is that if "ret" is an error code here, then we don't
want to do the next call to cam_i2c_write(), so actually let's flip that
test around and return the error.  This is more of a theoretical issue
than something which is likely to affect real life.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Diffstat (limited to 'drivers/media/i2c/sr030pc30.c')
-rw-r--r--drivers/media/i2c/sr030pc30.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/i2c/sr030pc30.c b/drivers/media/i2c/sr030pc30.c
index 3d3fb1cda28c..11f6c7a5e0e7 100644
--- a/drivers/media/i2c/sr030pc30.c
+++ b/drivers/media/i2c/sr030pc30.c
@@ -569,7 +569,7 @@ static int sr030pc30_base_config(struct v4l2_subdev *sd)
 	if (!ret)
 		ret = sr030pc30_pwr_ctrl(sd, false, false);
 
-	if (!ret && !info->pdata)
+	if (ret)
 		return ret;
 
 	expmin = EXPOS_MIN_MS * info->pdata->clk_rate / (8 * 1000);