usb: xhci: remove unnecessary second abort try

The second try was a workaround for (what we thought was) command
ring failing to stop in the first place. But this turns out to be
due to the race that we have fixed(see "xhci: Fix race related to
abort operation"). With that fix, it is time to remove the second
try.

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-ring.c b/drivers/usb/host/xhci-ring.c
index 8ccd24eca3672ed0eca0be4a058e363cd27960b1..bcc08949560a3b18d87725e300e58a742c8ac9a0 100644 (file)
--- a/drivers/usb/host/xhci-ring.c
+++ b/drivers/usb/host/xhci-ring.c
@@ -362,19 +362,11 @@ static int xhci_abort_cmd_ring(struct xhci_hcd *xhci, unsigned long flags)
        ret = xhci_handshake(&xhci->op_regs->cmd_ring,
                        CMD_RING_RUNNING, 0, 5 * 1000 * 1000);
        if (ret < 0) {
-               /* we are about to kill xhci, give it one more chance */
-               xhci_write_64(xhci, temp_64 | CMD_RING_ABORT,
-                             &xhci->op_regs->cmd_ring);
-               udelay(1000);
-               ret = xhci_handshake(&xhci->op_regs->cmd_ring,
-                                    CMD_RING_RUNNING, 0, 3 * 1000 * 1000);
-               if (ret < 0) {
-                       xhci_err(xhci, "Stopped the command ring failed, "
-                                "maybe the host is dead\n");
-                       xhci->xhc_state |= XHCI_STATE_DYING;
-                       xhci_halt(xhci);
-                       return -ESHUTDOWN;
-               }
+               xhci_err(xhci,
+                        "Stop command ring failed, maybe the host is dead\n");
+               xhci->xhc_state |= XHCI_STATE_DYING;
+               xhci_halt(xhci);
+               return -ESHUTDOWN;
        }
        /*
         * Writing the CMD_RING_ABORT bit should cause a cmd completion event,