diff options
| author | Ben Hutchings <ben@decadent.org.uk> | 2015-11-18 02:01:21 +0000 |
|---|---|---|
| committer | Zefan Li <lizefan@huawei.com> | 2016-04-27 18:55:30 +0800 |
| commit | e08cc94c26fab53cf0d2c655ecdcaf39d31dd18a (patch) | |
| tree | a3e7088309dfb03fb681076f910acae3facd70eb | |
| parent | 9237baa5c61ef9e11d8a71d02d73b53d8a2b7d01 (diff) | |
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>
| -rw-r--r-- | drivers/usb/core/config.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/usb/core/config.c b/drivers/usb/core/config.c index 6baa8365bb16..bfc9b69122d0 100644 --- a/drivers/usb/core/config.c +++ b/drivers/usb/core/config.c @@ -117,7 +117,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; } |