mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-12 13:55:32 +00:00
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: 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:
parent
c89d3bbbfc
commit
5b9c75c794
3 changed files with 3 additions and 5 deletions
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -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;
|
||||
|
||||
|
|
|
@ -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,
|
||||
|
|
Loading…
Reference in a new issue