]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
usb: don't clear FEAT_C_ENABLE on usb_port_runtime_resume failure
authorDan Williams <dan.j.williams@intel.com>
Wed, 21 May 2014 01:09:03 +0000 (18:09 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 27 May 2014 23:51:50 +0000 (16:51 -0700)
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>
drivers/usb/core/port.c

index 827b0d38f73d735f6c14958bb144e1b4936d9aa0..f41f0512307e6fe410a8a3a4883692d2bfb6a07f 100644 (file)
@@ -110,7 +110,6 @@ static int usb_port_runtime_resume(struct device *dev)
                if (retval < 0)
                        dev_dbg(&port_dev->dev, "can't get reconnection after setting port  power on, status %d\n",
                                        retval);
-               usb_clear_port_feature(hdev, port1, USB_PORT_FEAT_C_ENABLE);
                retval = 0;
        }