Commit 9a4619ef authored Mar 05, 2021 by Jia-Ju Bai Committed by Mauro Carvalho Chehab Apr 06, 2021

media: i2c: imx274: fix error return code of imx274_s_frame_interval()



When __v4l2_ctrl_modify_range() fails, no error return code of
imx274_s_frame_interval() is assigned.
To fix this bug, ret is assigned with the return valye of
__v4l2_ctrl_modify_range(), and then ret is checked.

Reported-by: TOTE Robot <oslab@tsinghua.edu.cn>
Signed-off-by: Jia-Ju Bai <baijiaju1990@gmail.com>
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

parent a7de6eac

drivers/media/i2c/imx274.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -1381,7 +1381,8 @@ static int imx274_s_frame_interval(struct v4l2_subdev *sd,
		max = fi->interval.numerator * 1000000
		/ fi->interval.denominator;
		def = max;
		if (__v4l2_ctrl_modify_range(ctrl, min, max, 1, def)) {
		ret = __v4l2_ctrl_modify_range(ctrl, min, max, 1, def);
		if (ret) {
		dev_err(&imx274->client->dev,
		"Exposure ctrl range update failed\n");
		goto unlock;