patch "usb: missing parentheses in USE_NEW_SCHEME" added to usb-linus
Subsystems (2)
This is a note to let you know that I've just added the patch titled
usb: missing parentheses in USE_NEW_SCHEME
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.
From 1530f6f5f5806b2abbf2a9276c0db313ae9a0e09 Mon Sep 17 00:00:00 2001
From: Qi Zhou <[email protected]>
Date: Sat, 4 Jan 2020 11:02:01 +0000
Subject: usb: missing parentheses in USE_NEW_SCHEME
According to bd0e6c9614b9 ("usb: hub: try old enumeration scheme first for high speed devices") the kernel will try the old enumeration scheme first for high speed devices. This can happen when a high speed device is plugged in.
But due to missing parentheses in the USE_NEW_SCHEME define, this logic can get messed up and the incorrect result happens.
--- drivers/usb/core/hub.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/core/hub.c +1 -1
@@ -2692,7 +2692,7 @@ static unsigned hub_is_wusb(struct usb_hub *hub)#define SET_ADDRESS_TRIES 2#define GET_DESCRIPTOR_TRIES 2#define SET_CONFIG_TRIES (2 * (use_both_schemes + 1)) -#define USE_NEW_SCHEME (i, scheme) ((i) / 2 == (int)scheme) +#define USE_NEW_SCHEME (i, scheme) ((i) / 2 == (int)(scheme))#define HUB_ROOT_RESET_TIME 60/* times are in msec */ #define HUB_SHORT_RESET_TIME 10
Signature · 1 line
2.24.1