Commit aad8003a authored Jan 04, 2020 by Qi Zhou Committed by Greg Kroah-Hartman Jan 12, 2020

usb: missing parentheses in USE_NEW_SCHEME



commit 1530f6f5f5806b2abbf2a9276c0db313ae9a0e09 upstream.

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.

Acked-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Qi Zhou <atmgnd@outlook.com>
Link: https://lore.kernel.org/r/ht4mtag8ZP-HKEhD0KkJhcFnVlOFV8N8eNjJVRD9pDkkLUNhmEo8_cL_sl7xy9mdajdH-T8J3TFQsjvoYQT61NFjQXy469Ed_BbBw_x4S1E=@protonmail.com


[ fixup changelog text - gregkh]
Cc: stable <stable@vger.kernel.org>
Fixes: bd0e6c9614b9 ("usb: hub: try old enumeration scheme first for high speed devices")
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent a16ae613

drivers/usb/core/hub.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -2657,7 +2657,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