| From 8a1a78a566731c7b4dd94b7d255a8a671caed96a Mon Sep 17 00:00:00 2001 |
| From: Qi Zhou <atmgnd@outlook.com> |
| Date: Sat, 4 Jan 2020 11:02:01 +0000 |
| Subject: [PATCH] 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> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c |
| index 0e7f98a32aad..ea801737002a 100644 |
| --- a/drivers/usb/core/hub.c |
| +++ b/drivers/usb/core/hub.c |
| @@ -2689,7 +2689,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 |
| -- |
| 2.7.4 |
| |
