iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

media: uvcvideo: Undup use uvc_endpoint_max_bpi() code

Browse Source 
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: Ricardo Ribalda <ribalda@chromium.org>
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
This commit is contained in:
Ricardo Ribalda 2022-04-01 19:24:37 +02:00 committed by Mauro Carvalho Chehab
parent c89d3bbbfc
commit 5b9c75c794
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/media/usb/uvc/uvc_driver.c
View File

@ -1009,9 +1009,7 @@ static int uvc_parse_streaming(struct uvc_device *dev,
streaming->header.bEndpointAddress); streaming->header.bEndpointAddress);
if (ep == NULL) if (ep == NULL)
continue; continue;
psize = uvc_endpoint_max_bpi(dev->udev, ep);
psize = le16_to_cpu(ep->desc.wMaxPacketSize);
psize = (psize & 0x07ff) * (1 + ((psize >> 11) & 3));
if (psize > streaming->maxpsize) if (psize > streaming->maxpsize)
streaming->maxpsize = psize; streaming->maxpsize = psize;
} }

3
drivers/media/usb/uvc/uvc_video.c
View File

@ -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. * Compute the maximum number of bytes per interval for an endpoint.
*/ */
static unsigned int uvc_endpoint_max_bpi(struct usb_device *dev, u16 uvc_endpoint_max_bpi(struct usb_device *dev, struct usb_host_endpoint *ep)
struct usb_host_endpoint *ep)
{ {
u16 psize; u16 psize;

1
drivers/media/usb/uvc/uvcvideo.h
View File

@ -911,6 +911,7 @@ void uvc_simplify_fraction(u32 *numerator, u32 *denominator,
u32 uvc_fraction_to_interval(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, struct usb_host_endpoint *uvc_find_endpoint(struct usb_host_interface *alts,
u8 epaddr); u8 epaddr);
u16 uvc_endpoint_max_bpi(struct usb_device *dev, struct usb_host_endpoint *ep);
/* Quirks support */ /* Quirks support */
void uvc_video_decode_isight(struct uvc_urb *uvc_urb, void uvc_video_decode_isight(struct uvc_urb *uvc_urb,