diff options
author | Ingo Molnar <mingo@kernel.org> | 2015-12-14 09:31:23 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2015-12-14 09:31:23 +0100 |
commit | 057032e457f702e2f4af18cfa99c3afab6841d24 (patch) | |
tree | d46c8325756a3a2be28c286b1408e2e314e3dafb /drivers/usb/core/config.c | |
parent | 54c9238cfd495d234b0e02fa7dcce5b1671a42dd (diff) | |
parent | 9f9499ae8e6415cefc4fe0a96ad0e27864353c89 (diff) |
Merge tag 'v4.4-rc5' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/usb/core/config.c')
-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 7caff020106e..5050760f5e17 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; } |