media:i2c: fix coverity defects

Fixed out of bound access
Fixed wrong shift value to compute gain

Coverity ID 29587
Coverity ID 36185

Bug 200192387

Change-Id: I60999628c38192c41ce7e75099b65643d7476f2c
Signed-off-by: Wenjia Zhou <wenjiaz@nvidia.com>
Reviewed-on: http://git-master/r/1307363
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Shubham Chandra <shubhamc@nvidia.com>
Reviewed-by: Frank Chen <frankc@nvidia.com>
Reviewed-by: svccoveritychecker <svccoveritychecker@nvidia.com>
GVS: Gerrit_Virtual_Submit
Reviewed-by: Bhanu Murthy V <bmurthyv@nvidia.com>

2 files changed, 6 insertions, 7 deletions

diff --git a/drivers/media/i2c/lc898212.c b/drivers/media/i2c/lc898212.c
index 621b97f3f..44cdb876e 100644
--- a/drivers/media/i2c/lc898212.c
+++ b/drivers/media/i2c/lc898212.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2016, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2015-2017, NVIDIA CORPORATION.  All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms and conditions of the GNU General Public License,
@@ -327,14 +327,13 @@ static unsigned int convert_signed16b_to_unsigned10b(s16 data)
 static int lc898212_init(struct lc898212 *priv)
 {
         int err;
-        u16 data;
+        int data;
 
         err = lc898212_write_table(priv, lc898212_init_setting);
 
-        err |= regmap_read(priv->regmap16, LC898212_ADOFFSET,
-                                        (unsigned int *) &data);
+        err |= regmap_read(priv->regmap16, LC898212_ADOFFSET, &data);
         priv->s_data->def_position =
-                        convert_signed16b_to_unsigned10b((s16)data);
+                        convert_signed16b_to_unsigned10b((s16)(data & 0xffff));
         err |= regmap_write(priv->regmap16, LC898212_RZ, data);
 
         /* Servo On */
diff --git a/drivers/media/i2c/ov23850.c b/drivers/media/i2c/ov23850.c
index 141287d8e..bad408019 100644
--- a/drivers/media/i2c/ov23850.c
+++ b/drivers/media/i2c/ov23850.c
@@ -1,7 +1,7 @@
 /*
  * ov23850.c - ov23850 sensor driver
  *
- * Copyright (c) 2013-2016, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2013-2017, NVIDIA CORPORATION.  All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms and conditions of the GNU General Public License,
@@ -252,7 +252,7 @@ static inline void ov23850_get_gain_reg(ov23850_reg *regs,
                                 u16 gain)
 {
         regs->addr = OV23850_GAIN_ADDR_MSB;
-        regs->val = (gain >> 16) & 0x07;
+        regs->val = (gain >> 8) & 0x07;
         (regs + 1)->addr = OV23850_GAIN_ADDR_LSB;
         (regs + 1)->val = (gain) & 0xff;
 }