lkml.org 
[lkml]   [2017]   [Sep]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[PATCH 3.16 043/233] USB: gadget: dummy_hcd: fix hub-descriptor removable fields
    3.16.48-rc1 review patch.  If anyone has any objections, please let me know.

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

    From: Johan Hovold <johan@kernel.org>

    commit d81182ce30dbd497a1e7047d7fda2af040347790 upstream.

    Flag the first and only port as removable while also leaving the
    remaining bits (including the reserved bit zero) unset in accordance
    with the specifications:

    "Within a byte, if no port exists for a given location, the bit
    field representing the port characteristics shall be 0."

    Also add a comment marking the legacy PortPwrCtrlMask field.

    Fixes: 1cd8fd2887e1 ("usb: gadget: dummy_hcd: add SuperSpeed support")
    Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2")
    Cc: Tatyana Brokhman <tlinder@codeaurora.org>
    Signed-off-by: Johan Hovold <johan@kernel.org>
    Acked-by: Alan Stern <stern@rowland.harvard.edu>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    [bwh: Backported to 3.16: adjust filename]
    Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
    ---
    drivers/usb/gadget/dummy_hcd.c | 6 +++---
    1 file changed, 3 insertions(+), 3 deletions(-)

    --- a/drivers/usb/gadget/dummy_hcd.c
    +++ b/drivers/usb/gadget/dummy_hcd.c
    @@ -1933,7 +1933,7 @@ ss_hub_descriptor(struct usb_hub_descrip
    desc->wHubCharacteristics = cpu_to_le16(0x0001);
    desc->bNbrPorts = 1;
    desc->u.ss.bHubHdrDecLat = 0x04; /* Worst case: 0.4 micro sec*/
    - desc->u.ss.DeviceRemovable = 0xffff;
    + desc->u.ss.DeviceRemovable = 0;
    }

    static inline void hub_descriptor(struct usb_hub_descriptor *desc)
    @@ -1943,8 +1943,8 @@ static inline void hub_descriptor(struct
    desc->bDescLength = 9;
    desc->wHubCharacteristics = cpu_to_le16(0x0001);
    desc->bNbrPorts = 1;
    - desc->u.hs.DeviceRemovable[0] = 0xff;
    - desc->u.hs.DeviceRemovable[1] = 0xff;
    + desc->u.hs.DeviceRemovable[0] = 0;
    + desc->u.hs.DeviceRemovable[1] = 0xff; /* PortPwrCtrlMask */
    }

    static int dummy_hub_control(
    \
     
     \ /
      Last update: 2017-09-10 01:26    [W:4.090 / U:0.128 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site