usb: xhci: Disable slot even when virt-dev is null

xhci_disable_slot() is a helper for disabling a slot when a device
goes away or recovers from error situations. Currently, it checks
the corespoding virt-dev pointer and returns directly (w/o issuing
disable slot command) if it's null.

This is unnecessary and will cause problems in case where virt-dev
allocation fails and xhci_disable_slot() is called to roll back the
hardware state. Refer to the implementation of xhci_alloc_dev().

This patch removes lines to check virt-dev in xhci_disable_slot().

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>
Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/usb/host/xhci-hub.c b/drivers/usb/host/xhci-hub.c
index ad89a6d4111b45e0c048ee437ffd391f5af846e0..f0ae9df7cbef0b923a6f2579aa028105da19509a 100644 (file)
--- a/drivers/usb/host/xhci-hub.c
+++ b/drivers/usb/host/xhci-hub.c
@@ -612,6 +612,9 @@ static int xhci_enter_test_mode(struct xhci_hcd *xhci,
        xhci_dbg(xhci, "Disable all slots\n");
        spin_unlock_irqrestore(&xhci->lock, *flags);
        for (i = 1; i <= HCS_MAX_SLOTS(xhci->hcs_params1); i++) {
+               if (!xhci->devs[i])
+                       continue;
+
                retval = xhci_disable_slot(xhci, NULL, i);
                if (retval)
                        xhci_err(xhci, "Failed to disable slot %d, %d. Enter test mode anyway\n",

diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
index e20b2c26a3f1b7d009d936bae74eb66c7b75c2f6..5cb7c5cd4af5c38728fc93d68ca7fc20f3a90a9b 100644 (file)
--- a/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c
@@ -3581,11 +3581,7 @@ int xhci_disable_slot(struct xhci_hcd *xhci, struct xhci_command *command,
        unsigned long flags;
        u32 state;
        int ret = 0;
-       struct xhci_virt_device *virt_dev;
 
-       virt_dev = xhci->devs[slot_id];
-       if (!virt_dev)
-               return -EINVAL;
        if (!command)
                command = xhci_alloc_command(xhci, false, false, GFP_KERNEL);
        if (!command)