Commit fc78e0b2 authored by Philipp Zabel's avatar Philipp Zabel Committed by Mauro Carvalho Chehab
Browse files

media: gspca: support multiple pixel formats in ENUM_FRAMEINTERVALS 



If a driver supports multiple pixel formats with the same frame size,
ENUM_FRAMEINTERVALS will currently only work for the first pixel format.
Fix this by adding pixelformat support to wxh_to_mode().

Signed-off-by: default avatarPhilipp Zabel <philipp.zabel@gmail.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
parent 4d4abf06

drivers/media/usb/gspca/gspca.c

+5 −3
Original line number Diff line number Diff line
@@ -912,13 +912,14 @@ static void gspca_set_default_mode(struct gspca_dev *gspca_dev) 
}



static int wxh_to_mode(struct gspca_dev *gspca_dev,

			int width, int height)

			int width, int height, u32 pixelformat)

{

	int i;



	for (i = 0; i < gspca_dev->cam.nmodes; i++) {

		if (width == gspca_dev->cam.cam_mode[i].width

		    && height == gspca_dev->cam.cam_mode[i].height)

		    && height == gspca_dev->cam.cam_mode[i].height

		    && pixelformat == gspca_dev->cam.cam_mode[i].pixelformat)

			return i;

	}

	return -EINVAL;
@@ -1152,7 +1153,8 @@ static int vidioc_enum_frameintervals(struct file *filp, void *priv, 
	int mode;

	__u32 i;



	mode = wxh_to_mode(gspca_dev, fival->width, fival->height);

	mode = wxh_to_mode(gspca_dev, fival->width, fival->height,

			   fival->pixel_format);

	if (mode < 0)

		return -EINVAL;