diff options
author | Dan Williams <dan.j.williams@intel.com> | 2014-05-20 21:09:03 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-05-27 19:51:50 -0400 |
commit | 7c604079bdf729e7b8c4b0e67c688b5081d1863d (patch) | |
tree | ed6bef25fc148e6ebfc596d1af78d1dbee494c72 /drivers/usb/core | |
parent | 7ad3c47088f9faec463f5226e5e968a5c3b0e593 (diff) |
usb: don't clear FEAT_C_ENABLE on usb_port_runtime_resume failure
Three reasons:
1/ It's an invalid operation on usb3 ports
2/ There's no guarantee of when / if a usb2 port has entered an error
state relative to PORT_POWER request
3/ The port is active / powered at this point, so khubd will clear it as
a matter of course
Acked-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/core')
-rw-r--r-- | drivers/usb/core/port.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/usb/core/port.c b/drivers/usb/core/port.c index 827b0d38f73d..f41f0512307e 100644 --- a/drivers/usb/core/port.c +++ b/drivers/usb/core/port.c | |||
@@ -110,7 +110,6 @@ static int usb_port_runtime_resume(struct device *dev) | |||
110 | if (retval < 0) | 110 | if (retval < 0) |
111 | dev_dbg(&port_dev->dev, "can't get reconnection after setting port power on, status %d\n", | 111 | dev_dbg(&port_dev->dev, "can't get reconnection after setting port power on, status %d\n", |
112 | retval); | 112 | retval); |
113 | usb_clear_port_feature(hdev, port1, USB_PORT_FEAT_C_ENABLE); | ||
114 | retval = 0; | 113 | retval = 0; |
115 | } | 114 | } |
116 | 115 | ||