diff options
| author | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2014-09-16 18:26:47 +0400 |
|---|---|---|
| committer | Felipe Balbi <balbi@ti.com> | 2014-09-16 18:59:47 +0400 |
| commit | e102609f107269fbc04af21548e78e99c02b6204 (patch) | |
| tree | 1125404e62ac8efb7a4aea546ecbf70553808f17 /drivers/usb/gadget/function/f_uvc.c | |
| parent | 4a6698b80cfe36dd4e3c6bc30ab81b4e0a837f64 (diff) | |
| download | linux-e102609f107269fbc04af21548e78e99c02b6204.tar.xz | |
usb: gadget: uvc: Fix endianness mismatches
The struct usb_endpoint_descriptor wMaxPacketSize field the struct
usb_ss_ep_comp_descriptor wBytesPerInterval field are stored in
little-endian format. Convert the values from CPU order to little endian
before storing the values.
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'drivers/usb/gadget/function/f_uvc.c')
| -rw-r--r-- | drivers/usb/gadget/function/f_uvc.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/usb/gadget/function/f_uvc.c b/drivers/usb/gadget/function/f_uvc.c index bf9abf4aff22..e126439e4b65 100644 --- a/drivers/usb/gadget/function/f_uvc.c +++ b/drivers/usb/gadget/function/f_uvc.c @@ -596,19 +596,20 @@ uvc_function_bind(struct usb_configuration *c, struct usb_function *f) } uvc_fs_streaming_ep.wMaxPacketSize = - min(opts->streaming_maxpacket, 1023U); + cpu_to_le16(min(opts->streaming_maxpacket, 1023U)); uvc_fs_streaming_ep.bInterval = opts->streaming_interval; - uvc_hs_streaming_ep.wMaxPacketSize = max_packet_size; - uvc_hs_streaming_ep.wMaxPacketSize |= ((max_packet_mult - 1) << 11); + uvc_hs_streaming_ep.wMaxPacketSize = + cpu_to_le16(max_packet_size | ((max_packet_mult - 1) << 11)); uvc_hs_streaming_ep.bInterval = opts->streaming_interval; - uvc_ss_streaming_ep.wMaxPacketSize = max_packet_size; + uvc_ss_streaming_ep.wMaxPacketSize = cpu_to_le16(max_packet_size); uvc_ss_streaming_ep.bInterval = opts->streaming_interval; uvc_ss_streaming_comp.bmAttributes = max_packet_mult - 1; uvc_ss_streaming_comp.bMaxBurst = opts->streaming_maxburst; uvc_ss_streaming_comp.wBytesPerInterval = - max_packet_size * max_packet_mult * opts->streaming_maxburst; + cpu_to_le16(max_packet_size * max_packet_mult * + opts->streaming_maxburst); /* Allocate endpoints. */ ep = usb_ep_autoconfig(cdev->gadget, &uvc_control_ep); |