[PATCH v2 4/5] usb: xhci: Return error when host is dead in xhci_disable_slot()

From	Lu Baolu <baolu.lu@linux.intel.com>
Newsgroups	linux.kernel
Subject	[PATCH v2 4/5] usb: xhci: Return error when host is dead in xhci_disable_slot()
Date	2017-07-27 04:30 +0200
Message-ID	<u7GIN-em-11@gated-at.bofh.it> (permalink)
References	<u7GIN-em-3@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

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: f9e609b82479 ("usb: xhci: Add helper function xhci_disable_slot().")
Cc: Guoqing Zhang <guoqing.zhang@intel.com>
Signed-off-by: Lu Baolu <baolu.lu@linux.intel.com>
---
 drivers/usb/host/xhci.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
index 2df601e..d6b728d 100644
--- a/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c
@@ -3568,10 +3568,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,
-- 
2.7.4

Back to linux.kernel | Previous | Next | Find similar | Unroll thread

Thread

[PATCH v2 4/5] usb: xhci: Return error when host is dead in xhci_disable_slot() Lu Baolu <baolu.lu@linux.intel.com> - 2017-07-27 04:30 +0200

csiph-web