Commit a6fc86ed authored by Hans de Goede's avatar Hans de Goede Committed by Mauro Carvalho Chehab
Browse files

media: atomisp: ov2680: Fix ov2680_enum_frame_interval() 



Fix and simplify ov2680_enum_frame_interval(), the index is not
an index into ov2680_res_preview[], so using N_PREVIEW is wrong.

Instead it is an index indexing the different framerates for
the resolution specified in fie->width, fie->height.

Since the ov2680 code only supports a single fixed 30 fps,
index must always be 0 and we don't need to check the other
fie input values.

Reviewed-by: default avatarAndy Shevchenko <andy@kernel.org>
Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@kernel.org>
parent 10704b45

drivers/staging/media/atomisp/i2c/atomisp-ov2680.c

+4 −11
Original line number Diff line number Diff line
@@ -711,19 +711,12 @@ static int ov2680_enum_frame_interval(struct v4l2_subdev *sd, 
				      struct v4l2_subdev_state *sd_state,

				      struct v4l2_subdev_frame_interval_enum *fie)

{

	struct v4l2_fract fract;



	if (fie->index >= N_RES_PREVIEW ||

	    fie->width > ov2680_res_preview[0].width ||

	    fie->height > ov2680_res_preview[0].height ||

	    fie->which > V4L2_SUBDEV_FORMAT_ACTIVE)

	/* Only 1 framerate */

	if (fie->index)

		return -EINVAL;



	fract.numerator = 1;

	fract.denominator = OV2680_FPS;



	fie->interval = fract;



	fie->interval.numerator = 1;

	fie->interval.denominator = OV2680_FPS;

	return 0;

}