| Message ID | 1408575568-20562-17-git-send-email-hverkuil@xs4all.nl (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hi Hans, Thank you for the patch. On Thursday 21 August 2014 00:59:15 Hans Verkuil wrote: > From: Hans Verkuil <hans.verkuil@cisco.com> > > drivers/media/usb/uvc/uvc_video.c:1466:38: warning: incorrect type in return > expression (different base types) > > Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> I assume you will push the patch yourself. Please let me know if you would like me to take it into my tree instead. > --- > drivers/media/usb/uvc/uvc_video.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/media/usb/uvc/uvc_video.c > b/drivers/media/usb/uvc/uvc_video.c index 9144a2f..7e350d7 100644 > --- a/drivers/media/usb/uvc/uvc_video.c > +++ b/drivers/media/usb/uvc/uvc_video.c > @@ -1463,7 +1463,7 @@ static unsigned int uvc_endpoint_max_bpi(struct > usb_device *dev, > > switch (dev->speed) { > case USB_SPEED_SUPER: > - return ep->ss_ep_comp.wBytesPerInterval; > + return le16_to_cpu(ep->ss_ep_comp.wBytesPerInterval); > case USB_SPEED_HIGH: > psize = usb_endpoint_maxp(&ep->desc); > return (psize & 0x07ff) * (1 + ((psize >> 11) & 3));
diff --git a/drivers/media/usb/uvc/uvc_video.c b/drivers/media/usb/uvc/uvc_video.c index 9144a2f..7e350d7 100644 --- a/drivers/media/usb/uvc/uvc_video.c +++ b/drivers/media/usb/uvc/uvc_video.c @@ -1463,7 +1463,7 @@ static unsigned int uvc_endpoint_max_bpi(struct usb_device *dev, switch (dev->speed) { case USB_SPEED_SUPER: - return ep->ss_ep_comp.wBytesPerInterval; + return le16_to_cpu(ep->ss_ep_comp.wBytesPerInterval); case USB_SPEED_HIGH: psize = usb_endpoint_maxp(&ep->desc); return (psize & 0x07ff) * (1 + ((psize >> 11) & 3));