| From 5377adb092664d336ac212499961cac5e8728794 Mon Sep 17 00:00:00 2001 |
| From: Ben Hutchings <ben@decadent.org.uk> |
| Date: Wed, 18 Nov 2015 02:01:21 +0000 |
| Subject: usb: Use the USB_SS_MULT() macro to decode burst multiplier for log |
| message |
| |
| 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: Zefan Li <lizefan@huawei.com> |
| --- |
| drivers/usb/core/config.c | 3 ++- |
| 1 file changed, 2 insertions(+), 1 deletion(-) |
| |
| --- a/drivers/usb/core/config.c |
| +++ b/drivers/usb/core/config.c |
| @@ -117,7 +117,8 @@ static void usb_parse_ss_endpoint_compan |
| 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; |
| } |
