[PATCH v3 1/1] usb: xhci: fix return value of xhci_setup_device()

From: Lu Baolu
Date: Fri Sep 09 2016 - 00:47:46 EST

xhci_setup_device() should return failure with correct error number
when xhci host has died, removed or halted.

During usb device enumeration, if usb host is not accessible (died,
removed or halted), the hc_driver->address_device() should return
a corresponding error code to usb core. But current xhci driver just
returns success. This misleads usb core to continue the enumeration
by reading the device descriptor, which will result in failure, and
users will get a misleading message like "device descriptor read/8,
error -110".

Cc: <stable@xxxxxxxxxxxxxxx> # v4.3+
Signed-off-by: Lu Baolu <baolu.lu@xxxxxxxxxxxxxxx>
- improve the commit description
- fix email mismatch issue

drivers/usb/host/xhci.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
index 01d96c9..3e66e73 100644
--- a/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c
@@ -3785,8 +3785,10 @@ static int xhci_setup_device(struct usb_hcd *hcd, struct usb_device *udev,


- if (xhci->xhc_state) /* dying, removing or halted */
+ if (xhci->xhc_state) { /* dying, removing or halted */
+ ret = -ESHUTDOWN;
goto out;
+ }

if (!udev->slot_id) {
xhci_dbg_trace(xhci, trace_xhci_dbg_address,