Skip to contentSkip to conversation

patch "usb: Use the USB_SS_MULT() macro to decode burst multiplier for log" added to usb-linus

PATCH [email protected] 1 participant 1 message Dec 1, 2015

Subsystems (2)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

usb: Use the USB_SS_MULT() macro to decode burst multiplier for log

to my usb git tree which can be found at
git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git
in the usb-linus branch.

The patch will show up in the next release of the linux-next tree (usually sometime within the next 24 hours during the week.)

The patch will hopefully also be merged in Linus's tree for the next -rc kernel release.

If you have any questions about this process, please let me know.

Quoted 1 line

From 5377adb092664d336ac212499961cac5e8728794 Mon Sep 17 00:00:00 2001

From: Ben Hutchings <[email protected]>
Date: Wed, 18 Nov 2015 02:01:21 +0000
Subject: usb: Use the USB_SS_MULT() macro to decode burst multiplier for log
message

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 ...")
Cc stable <[email protected]>
---
 drivers/usb/core/config.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/usb/core/config.c +2 -1
index 7caff020106e..5050760f5e17 100644
@@ -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;
 	}
Signature · 1 line
2.6.2