* Patch "usb: Use the USB_SS_MULT() macro to decode burst multiplier for log message" has been added to the 3.10-stable tree
@ 2015-12-17 23:55 gregkh
0 siblings, 0 replies; only message in thread
From: gregkh @ 2015-12-17 23:55 UTC (permalink / raw)
To: ben, gregkh; +Cc: stable, stable-commits
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 message
to the 3.10-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
usb-use-the-usb_ss_mult-macro-to-decode-burst-multiplier-for-log-message.patch
and it can be found in the queue-3.10 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@vger.kernel.org> know about it.
>From 5377adb092664d336ac212499961cac5e8728794 Mon Sep 17 00:00:00 2001
From: Ben Hutchings <ben@decadent.org.uk>
Date: Wed, 18 Nov 2015 02:01:21 +0000
Subject: usb: Use the USB_SS_MULT() macro to decode burst multiplier for log message
From: Ben Hutchings <ben@decadent.org.uk>
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>
---
drivers/usb/core/config.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--- a/drivers/usb/core/config.c
+++ b/drivers/usb/core/config.c
@@ -117,7 +117,8 @@ static void usb_parse_ss_endpoint_compan
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;
}
Patches currently in stable-queue which might be from ben@decadent.org.uk are
queue-3.10/usb-use-the-usb_ss_mult-macro-to-decode-burst-multiplier-for-log-message.patch
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2015-12-17 23:55 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-12-17 23:55 Patch "usb: Use the USB_SS_MULT() macro to decode burst multiplier for log message" has been added to the 3.10-stable tree gregkh
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.