Merge branch 'linux-linaro-lsk-v4.4-android' of git://git.linaro.org/kernel/linux...

[firefly-linux-kernel-4.4.55.git] / drivers / usb / host / xhci-ring.c

diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c
index de7dce6eb474bbe502d5f45f0f0ad21e6308d198..408eccdd2ca9c7f112463e15486f7b65beab2d68 100644 (file)
--- a/drivers/usb/host/xhci-ring.c
+++ b/drivers/usb/host/xhci-ring.c
@@ -4055,7 +4055,8 @@ static int queue_command(struct xhci_hcd *xhci, struct xhci_command *cmd,
        int ret;
 
        if ((xhci->xhc_state & XHCI_STATE_DYING) ||
-               (xhci->xhc_state & XHCI_STATE_HALTED)) {
+               (xhci->xhc_state & XHCI_STATE_HALTED) ||
+               (xhci->xhc_state & XHCI_STATE_REMOVING)) {
                xhci_dbg(xhci, "xHCI dying or halted, can't queue_command\n");
                return -ESHUTDOWN;
        }