lkml.org 
[lkml]   [2017]   [Jul]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[PATCH 3.16 078/178] usb: gadget: uvc: Fix endianness mismatches
    3.16.46-rc1 review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

    commit e102609f107269fbc04af21548e78e99c02b6204 upstream.

    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>
    [bwh: Backported to 3.16: adjust filename, context]
    Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
    ---
    drivers/usb/gadget/f_uvc.c | 11 ++++++-----
    1 file changed, 6 insertions(+), 5 deletions(-)

    --- a/drivers/usb/gadget/f_uvc.c
    +++ b/drivers/usb/gadget/f_uvc.c
    @@ -611,19 +611,21 @@ uvc_function_bind(struct usb_configurati
    max_packet_size = streaming_maxpacket / 3;
    }

    - uvc_fs_streaming_ep.wMaxPacketSize = min(streaming_maxpacket, 1023U);
    + uvc_fs_streaming_ep.wMaxPacketSize =
    + cpu_to_le16(min(streaming_maxpacket, 1023U));
    uvc_fs_streaming_ep.bInterval = 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 = 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 = streaming_interval;
    uvc_ss_streaming_comp.bmAttributes = max_packet_mult - 1;
    uvc_ss_streaming_comp.bMaxBurst = streaming_maxburst;
    uvc_ss_streaming_comp.wBytesPerInterval =
    - max_packet_size * max_packet_mult * streaming_maxburst;
    + cpu_to_le16(max_packet_size * max_packet_mult *
    + streaming_maxburst);

    /* Allocate endpoints. */
    ep = usb_ep_autoconfig(cdev->gadget, &uvc_control_ep);
    \
     
     \ /
      Last update: 2017-07-16 16:20    [W:4.320 / U:0.028 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site