diff options
| author | Ben Hutchings <ben@decadent.org.uk> | 2015-11-18 05:01:21 +0300 |
|---|---|---|
| committer | Jiri Slaby <jslaby@suse.cz> | 2016-01-05 19:48:52 +0300 |
| commit | 722c8c2146fdfea39770c177cf2449186b0795dd (patch) | |
| tree | a0dd6ddbb4df5d90cf0ab1b12a973d7a15a58f95 | |
| parent | fc71ffb35bc39d69347d5ab7395bca3eced2cc70 (diff) | |
| download | linux-722c8c2146fdfea39770c177cf2449186b0795dd.tar.xz | |
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: Jiri Slaby <jslaby@suse.cz>
| -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 b9560f485d21..5c11adc6a5d6 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; } |