Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3c4a7372 authored by Hugues Fruchet's avatar Hugues Fruchet Committed by Mauro Carvalho Chehab
Browse files

media: ov5640: fix frame interval enumeration 



Driver must reject frame interval enumeration of unsupported resolution.
This was detected by v4l2-compliance format ioctl test:
v4l2-compliance Format ioctls:
    info: found 2 frameintervals for pixel format 4745504a and size 176x144
  fail: v4l2-test-formats.cpp(123):
                           found frame intervals for invalid size 177x144
    test VIDIOC_ENUM_FMT/FRAMESIZES/FRAMEINTERVALS: FAIL

Signed-off-by: default avatarHugues Fruchet <hugues.fruchet@st.com>
Signed-off-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
parent 2bbc46e8

drivers/media/i2c/ov5640.c

+16 −18
Original line number Diff line number Diff line
@@ -1413,24 +1413,16 @@ static const struct ov5640_mode_info * 
ov5640_find_mode(struct ov5640_dev *sensor, enum ov5640_frame_rate fr,

		 int width, int height, bool nearest)

{

	const struct ov5640_mode_info *mode = NULL;

	int i;



	for (i = OV5640_NUM_MODES - 1; i >= 0; i--) {

		mode = &ov5640_mode_data[fr][i];

	const struct ov5640_mode_info *mode;



		if (!mode->reg_data)

			continue;

	mode = v4l2_find_nearest_size(ov5640_mode_data[fr],

				      ARRAY_SIZE(ov5640_mode_data[fr]),

				      hact, vact,

				      width, height);



		if ((nearest && mode->hact <= width &&

		     mode->vact <= height) ||

		    (!nearest && mode->hact == width &&

		     mode->vact == height))

			break;

	}



	if (nearest && i < 0)

		mode = &ov5640_mode_data[fr][0];

	if (!mode ||

	    (!nearest && (mode->hact != width || mode->vact != height)))

		return NULL;



	return mode;

}
@@ -2509,8 +2501,14 @@ static int ov5640_s_frame_interval(struct v4l2_subdev *sd, 


	sensor->current_fr = frame_rate;

	sensor->frame_interval = fi->interval;

	sensor->current_mode = ov5640_find_mode(sensor, frame_rate, mode->hact,

	mode = ov5640_find_mode(sensor, frame_rate, mode->hact,

				mode->vact, true);

	if (!mode) {

		ret = -EINVAL;

		goto out;

	}



	sensor->current_mode = mode;

	sensor->pending_mode_change = true;

out:

	mutex_unlock(&sensor->lock);