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

media: uvcvideo: Simplify uvc_endpoint_max_bpi() 



The case USB_SPEED_WIRELESS and the default one were doing the same.

Also, make always use of usb_endpoint_maxp_mult, as it should have a
sane value, even for LOW speed and WIRELESS.

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 18a9b21f

drivers/media/usb/uvc/uvc_video.c

+1 −8
Original line number Diff line number Diff line
@@ -1758,21 +1758,14 @@ static unsigned int uvc_endpoint_max_bpi(struct usb_device *dev, 
					 struct usb_host_endpoint *ep)

{

	u16 psize;

	u16 mult;



	switch (dev->speed) {

	case USB_SPEED_SUPER:

	case USB_SPEED_SUPER_PLUS:

		return le16_to_cpu(ep->ss_ep_comp.wBytesPerInterval);

	case USB_SPEED_HIGH:

		psize = usb_endpoint_maxp(&ep->desc);

		mult = usb_endpoint_maxp_mult(&ep->desc);

		return psize * mult;

	case USB_SPEED_WIRELESS:

		psize = usb_endpoint_maxp(&ep->desc);

		return psize;

	default:

		psize = usb_endpoint_maxp(&ep->desc);

		psize *= usb_endpoint_maxp_mult(&ep->desc);

		return psize;

	}

}