diff options
author | Hans Verkuil <hans.verkuil@cisco.com> | 2014-08-20 16:58:38 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <m.chehab@samsung.com> | 2014-09-03 08:36:44 -0400 |
commit | d71b0b348f0ac68c7a330ceb97b80d9e37f14545 (patch) | |
tree | 9ae696067022e011126d548a34992fbfc2dbcdf7 /drivers/media/usb/uvc/uvc_video.c | |
parent | 4182438e658dbf01c37a3b0fa035f08c303403ab (diff) |
[media] uvc: fix sparse warning
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>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Diffstat (limited to 'drivers/media/usb/uvc/uvc_video.c')
-rw-r--r-- | drivers/media/usb/uvc/uvc_video.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/usb/uvc/uvc_video.c b/drivers/media/usb/uvc/uvc_video.c index 9144a2f3ed82..7e350d788fe1 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, | |||
1463 | 1463 | ||
1464 | switch (dev->speed) { | 1464 | switch (dev->speed) { |
1465 | case USB_SPEED_SUPER: | 1465 | case USB_SPEED_SUPER: |
1466 | return ep->ss_ep_comp.wBytesPerInterval; | 1466 | return le16_to_cpu(ep->ss_ep_comp.wBytesPerInterval); |
1467 | case USB_SPEED_HIGH: | 1467 | case USB_SPEED_HIGH: |
1468 | psize = usb_endpoint_maxp(&ep->desc); | 1468 | psize = usb_endpoint_maxp(&ep->desc); |
1469 | return (psize & 0x07ff) * (1 + ((psize >> 11) & 3)); | 1469 | return (psize & 0x07ff) * (1 + ((psize >> 11) & 3)); |