| From | Herton Ronaldo Krzesinski <> | Subject | [PATCH 72/81] Revert "USB: Handle warm reset failure on empty port." | Date | Tue, 19 Feb 2013 15:49:35 -0300 |
| |
3.5.7.6 -stable review patch. If anyone has any objections, please let me know.
------------------
From: Herton Ronaldo Krzesinski <herton.krzesinski@canonical.com>
This reverts commit ff88c5021f17139d961478e40372f6bb028321bc, which is a cherry-pick of commit 65bdac5effd15d6af619b3b7218627ef4d84ed6a upstream.
As discussed on a recent thread on stable/lkml/etc. ("[regression] external HDD in USB3 enclosure cannot be dynamically removed"), this changed caused issues, and shall be reapplied later with the proper fixes, once they go into Linus tree.
Cc: Sarah Sharp <sarah.a.sharp@linux.intel.com> Signed-off-by: Herton Ronaldo Krzesinski <herton.krzesinski@canonical.com> --- drivers/usb/core/hub.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-)
diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c index c9590c6..1e8b3bd 100644 --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c @@ -2488,11 +2488,6 @@ static int hub_port_wait_reset(struct usb_hub *hub, int port1, return 0; } } else { - if (!(portstatus & USB_PORT_STAT_CONNECTION) || - hub_port_warm_reset_required(hub, - portstatus)) - return -ENOTCONN; - return 0; } @@ -4537,14 +4532,9 @@ static void hub_events(void) * SS.Inactive state. */ if (hub_port_warm_reset_required(hub, portstatus)) { - int status; - dev_dbg(hub_dev, "warm reset port %d\n", i); - status = hub_port_reset(hub, i, NULL, + hub_port_reset(hub, i, NULL, HUB_BH_RESET_TIME, true); - if (status < 0) - hub_port_disable(hub, i, 1); - connect_change = 0; } if (connect_change) -- 1.7.9.5
|