Commit 90797aee authored Jan 03, 2017 by Lu Baolu Committed by Greg Kroah-Hartman Jan 03, 2017

usb: xhci: fix return value of xhci_setup_device()



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@vger.kernel.org> # v4.3+
Signed-off-by: Lu Baolu <baolu.lu@linux.intel.com>
Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent ee8665e2

drivers/usb/host/xhci.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -3787,8 +3787,10 @@ static int xhci_setup_device(struct usb_hcd hcd, struct usb_device udev,

		mutex_lock(&xhci->mutex);

		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,

Admin message