Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dcabc76f authored by Lu Baolu's avatar Lu Baolu Committed by Greg Kroah-Hartman
Browse files

usb: xhci: Return error when host is dead in xhci_disable_slot() 



xhci_disable_slot() is a helper for disabling a slot when a device
goes away or recovers from error situations. Currently, it returns
success when it sees a dead host. This is not the right way to go.
It should return error and let the invoker know that disable slot
command was failed due to a dead host.

Fixes: f9e609b8 ("usb: xhci: Add helper function xhci_disable_slot().")
Cc: Guoqing Zhang <guoqing.zhang@intel.com>
Signed-off-by: default avatarLu Baolu <baolu.lu@linux.intel.com>
Signed-off-by: default avatarMathias Nyman <mathias.nyman@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 11ec7588

drivers/usb/host/xhci.c

+1 −2
Original line number Diff line number Diff line
@@ -3582,10 +3582,9 @@ int xhci_disable_slot(struct xhci_hcd *xhci, u32 slot_id) 
	state = readl(&xhci->op_regs->status);

	if (state == 0xffffffff || (xhci->xhc_state & XHCI_STATE_DYING) ||

			(xhci->xhc_state & XHCI_STATE_HALTED)) {

		xhci_free_virt_device(xhci, slot_id);

		spin_unlock_irqrestore(&xhci->lock, flags);

		kfree(command);

		return ret;

		return -ENODEV;

	}



	ret = xhci_queue_slot_control(xhci, command, TRB_DISABLE_SLOT,