lkml.org 
[lkml]   [2016]   [Jan]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.19.y-ckt 043/160] usb: Use the USB_SS_MULT() macro to decode burst multiplier for log message
    Date
    3.19.8-ckt13 -stable review patch.  If anyone has any objections, please let me know.

    ---8<------------------------------------------------------------

    From: Ben Hutchings <ben@decadent.org.uk>

    commit 5377adb092664d336ac212499961cac5e8728794 upstream.

    usb_parse_ss_endpoint_companion() now decodes the burst multiplier
    correctly in order to check that it's <= 3, but still uses the wrong
    expression if warning that it's > 3.

    Fixes: ff30cbc8da42 ("usb: Use the USB_SS_MULT() macro to get the ...")
    Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Signed-off-by: Kamal Mostafa <kamal@canonical.com>
    ---
    drivers/usb/core/config.c | 3 ++-
    1 file changed, 2 insertions(+), 1 deletion(-)

    diff --git a/drivers/usb/core/config.c b/drivers/usb/core/config.c
    index b9ddf0c..894894f 100644
    --- a/drivers/usb/core/config.c
    +++ b/drivers/usb/core/config.c
    @@ -115,7 +115,8 @@ static void usb_parse_ss_endpoint_companion(struct device *ddev, int cfgno,
    USB_SS_MULT(desc->bmAttributes) > 3) {
    dev_warn(ddev, "Isoc endpoint has Mult of %d in "
    "config %d interface %d altsetting %d ep %d: "
    - "setting to 3\n", desc->bmAttributes + 1,
    + "setting to 3\n",
    + USB_SS_MULT(desc->bmAttributes),
    cfgno, inum, asnum, ep->desc.bEndpointAddress);
    ep->ss_ep_comp.bmAttributes = 2;
    }
    --
    1.9.1

    \
     
     \ /
      Last update: 2016-01-20 03:21    [W:4.060 / U:0.084 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site