Commit c01591bd authored by Sarah Sharp's avatar Sarah Sharp Committed by Greg Kroah-Hartman
Browse files

USB: xhci: Fix error path when configuring endpoints. 



If we fail to queue an evaluate context command or a configure endpoint
command to the command ring in xhci_configure_endpoint(), we need to
remove the xhci_command structure from the device's command list before
returning.  If the command is left on the command list, it will sit there
indefinitely, blocking commands submitted after this fails.

Signed-off-by: default avatarSarah Sharp <sarah.a.sharp@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent f661c6f8

drivers/usb/host/xhci-hcd.c

+2 −0
Original line number Diff line number Diff line
@@ -1181,6 +1181,8 @@ static int xhci_configure_endpoint(struct xhci_hcd *xhci, 
		ret = xhci_queue_evaluate_context(xhci, in_ctx->dma,

				udev->slot_id);

	if (ret < 0) {

		if (command)

			list_del(&command->cmd_list);

		spin_unlock_irqrestore(&xhci->lock, flags);

		xhci_dbg(xhci, "FIXME allocate a new ring segment\n");

		return -ENOMEM;