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

Commit ccc135c3 authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Mauro Carvalho Chehab
Browse files

[media] uvcvideo: Remove duplicate check for number of buffers in queue_setup 



videobuf2 already ensures that the number of buffers will not exceed
VIDEO_MAX_FRAME, which is equal to our arbitraty limit of
UVC_MAX_VIDEO_BUFFERS. Remove the duplicate check.

Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Tested-by: default avatarPhilipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: default avatarMauro Carvalho Chehab <m.chehab@samsung.com>
parent 79af67e7

drivers/media/usb/uvc/uvc_queue.c

+0 −3
Original line number Diff line number Diff line
@@ -48,9 +48,6 @@ static int uvc_queue_setup(struct vb2_queue *vq, const struct v4l2_format *fmt, 
	struct uvc_streaming *stream =

			container_of(queue, struct uvc_streaming, queue);



	if (*nbuffers > UVC_MAX_VIDEO_BUFFERS)

		*nbuffers = UVC_MAX_VIDEO_BUFFERS;



	*nplanes = 1;



	sizes[0] = stream->ctrl.dwMaxVideoFrameSize;

drivers/media/usb/uvc/uvcvideo.h

+0 −2
Original line number Diff line number Diff line
@@ -115,8 +115,6 @@ 
#define UVC_URBS		5

/* Maximum number of packets per URB. */

#define UVC_MAX_PACKETS		32

/* Maximum number of video buffers. */

#define UVC_MAX_VIDEO_BUFFERS	32

/* Maximum status buffer size in bytes of interrupt URB. */

#define UVC_MAX_STATUS_SIZE	16