Commit 5b9c75c7 authored by Ricardo Ribalda's avatar Ricardo Ribalda Committed by Mauro Carvalho Chehab
Browse files

media: uvcvideo: Undup use uvc_endpoint_max_bpi() code 



Replace manual decoding of psize in uvc_parse_streaming(), with the code
from uvc_endpoint_max_bpi(). It also handles usb3 devices.

Signed-off-by: default avatarRicardo Ribalda <ribalda@chromium.org>
Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@kernel.org>
parent c89d3bbb

drivers/media/usb/uvc/uvc_driver.c

+1 −3
Original line number Diff line number Diff line
@@ -1009,9 +1009,7 @@ static int uvc_parse_streaming(struct uvc_device *dev, 
				streaming->header.bEndpointAddress);

		if (ep == NULL)

			continue;



		psize = le16_to_cpu(ep->desc.wMaxPacketSize);

		psize = (psize & 0x07ff) * (1 + ((psize >> 11) & 3));

		psize = uvc_endpoint_max_bpi(dev->udev, ep);

		if (psize > streaming->maxpsize)

			streaming->maxpsize = psize;

	}

drivers/media/usb/uvc/uvc_video.c

+1 −2
Original line number Diff line number Diff line
@@ -1754,8 +1754,7 @@ static void uvc_video_stop_transfer(struct uvc_streaming *stream, 
/*

 * Compute the maximum number of bytes per interval for an endpoint.

 */

static unsigned int uvc_endpoint_max_bpi(struct usb_device *dev,

					 struct usb_host_endpoint *ep)

u16 uvc_endpoint_max_bpi(struct usb_device *dev, struct usb_host_endpoint *ep)

{

	u16 psize;

drivers/media/usb/uvc/uvcvideo.h

+1 −0
Original line number Diff line number Diff line
@@ -911,6 +911,7 @@ void uvc_simplify_fraction(u32 *numerator, u32 *denominator, 
u32 uvc_fraction_to_interval(u32 numerator, u32 denominator);

struct usb_host_endpoint *uvc_find_endpoint(struct usb_host_interface *alts,

					    u8 epaddr);

u16 uvc_endpoint_max_bpi(struct usb_device *dev, struct usb_host_endpoint *ep);



/* Quirks support */

void uvc_video_decode_isight(struct uvc_urb *uvc_urb,