UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: Andy Shevchenko <andy@kernel.org>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
This commit is contained in:
Hans de Goede 2023-01-13 15:40:58 +01:00 committed by Mauro Carvalho Chehab
parent 10704b452a
commit a6fc86ed57
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/staging/media/atomisp/i2c/atomisp-ov2680.c
View File

@ -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;
}