aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQi Zhou <atmgnd@outlook.com>2020-01-04 11:02:01 +0000
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-01-12 12:17:30 +0100
commitaad8003ad201c518d8200f1da587b6a24150c4e4 (patch)
tree0357f485a6962e247091fe865730ed435e30a610
parenta16ae61375c0016b624c3e56bf7de50e8dcb2ea1 (diff)
downloadlinux-yocto-aad8003ad201c518d8200f1da587b6a24150c4e4.tar.gz
linux-yocto-aad8003ad201c518d8200f1da587b6a24150c4e4.tar.bz2
linux-yocto-aad8003ad201c518d8200f1da587b6a24150c4e4.zip
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>
-rw-r--r--drivers/usb/core/hub.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
index b33ec768404b..adc8e3a0138f 100644
--- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c
@@ -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