summaryrefslogtreecommitdiffstats
path: root/drivers/media/i2c
diff options
context:
space:
mode:
authorDan Carpenter <error27@gmail.com>2023-02-22 16:59:51 +0300
committerHans Verkuil <hverkuil-cisco@xs4all.nl>2023-05-25 16:21:21 +0200
commit1b3565dbc6aa124f34674e3dcf6966f663817e05 (patch)
tree63e4ed9ec631161804c824b4af6325fd9ee8f971 /drivers/media/i2c
parent2674486aac7d9c95ceb77daf7c30f862d4295c1c (diff)
downloadlinux-stable-1b3565dbc6aa124f34674e3dcf6966f663817e05.tar.gz
linux-stable-1b3565dbc6aa124f34674e3dcf6966f663817e05.tar.bz2
linux-stable-1b3565dbc6aa124f34674e3dcf6966f663817e05.zip
media: i2c: imx296: fix error checking in imx296_read_temperature()
The "& IMX296_TMDOUT_MASK" means that "tmdout" can't be negative so the error checking will not work. Fixes: cb33db2b6ccf ("media: i2c: IMX296 camera sensor driver") Signed-off-by: Dan Carpenter <error27@gmail.com> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com> Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Diffstat (limited to 'drivers/media/i2c')
-rw-r--r--drivers/media/i2c/imx296.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/media/i2c/imx296.c b/drivers/media/i2c/imx296.c
index 70c129833601..c0b9a5349668 100644
--- a/drivers/media/i2c/imx296.c
+++ b/drivers/media/i2c/imx296.c
@@ -922,10 +922,12 @@ static int imx296_read_temperature(struct imx296 *sensor, int *temp)
if (ret < 0)
return ret;
- tmdout = imx296_read(sensor, IMX296_TMDOUT) & IMX296_TMDOUT_MASK;
+ tmdout = imx296_read(sensor, IMX296_TMDOUT);
if (tmdout < 0)
return tmdout;
+ tmdout &= IMX296_TMDOUT_MASK;
+
/* T(°C) = 246.312 - 0.304 * TMDOUT */;
*temp = 246312 - 304 * tmdout;