Commit 5377adb0 authored Nov 18, 2015 by Ben Hutchings Committed by Greg Kroah-Hartman Dec 01, 2015

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: ff30cbc8 ("usb: Use the USB_SS_MULT() macro to get the ...")
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent f9fa1887

drivers/usb/core/config.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -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;
		}