UBUNTU: SAUCE: Revert "usb: handle warm-reset port requests on hub resume"

BugLink: https://bugs.launchpad.net/bugs/1856608
This reverts upstream commit 4fdc1790e6a9ef22399c6bc6e63b80f4609f3b7e
due to a regression.

Acked-by: Marcelo Henrique Cerri <marcelo.cerri@canonical.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>
Signed-off-by: dann frazier <dann.frazier@canonical.com>
Signed-off-by: Marcelo Henrique Cerri <marcelo.cerri@canonical.com>

diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
index 85fbb7bc54a1707623ea0d8d7d3205928f656b34..a745fd54cb8b3382208c2cd8b2e4e297050c73a2 100644 (file)
--- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c
@@ -104,8 +104,6 @@ EXPORT_SYMBOL_GPL(ehci_cf_port_reset_rwsem);
 static void hub_release(struct kref *kref);
 static int usb_reset_and_verify_device(struct usb_device *udev);
 static int hub_port_disable(struct usb_hub *hub, int port1, int set_state);
-static bool hub_port_warm_reset_required(struct usb_hub *hub, int port1,
-               u16 portstatus);
 
 static inline char *portspeed(struct usb_hub *hub, int portstatus)
 {
@@ -1112,11 +1110,6 @@ static void hub_activate(struct usb_hub *hub, enum hub_activation_type type)
                                                   USB_PORT_FEAT_ENABLE);
                }
 
-               /* Make sure a warm-reset request is handled by port_event */
-               if (type == HUB_RESUME &&
-                   hub_port_warm_reset_required(hub, port1, portstatus))
-                       set_bit(port1, hub->event_bits);
-
                /*
                 * Add debounce if USB3 link is in polling/link training state.
                 * Link will automatically transition to Enabled state after