[PATCH][F][SRU B/D/E] UBUNTU: SAUCE: Revert "usb: handle warm-reset port requests on hub resume"
dann frazier
dann.frazier at canonical.com
Tue Jan 7 22:11:29 UTC 2020
BugLink: https://bugs.launchpad.net/bugs/1856608
This reverts upstream commit 4fdc1790e6a9ef22399c6bc6e63b80f4609f3b7e
due to a regression.
Signed-off-by: dann frazier <dann.frazier at canonical.com>
---
drivers/usb/core/hub.c | 7 -------
1 file changed, 7 deletions(-)
diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
index 59b708ffc019f..4ddac9bd68e3c 100644
--- 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
--
2.25.0.rc1
More information about the kernel-team
mailing list