--- drivers/usb/host/ehci-q.c

+++ drivers/usb/host/ehci-q.c

@@ -315,7 +315,6 @@ qh_completions (struct ehci_hcd *ehci, s

int stopped;

unsigned count = 0;

u8 state;

- const __le32 halt = HALT_BIT(ehci);

struct ehci_qh_hw *hw = qh->hw;

if (unlikely (list_empty (&qh->qtd_list)))

@@ -422,7 +421,6 @@ qh_completions (struct ehci_hcd *ehci, s

&& !(qtd->hw_alt_next

& EHCI_LIST_END(ehci))) {

stopped = 1;

- goto halt;

}

/* stop scanning when we reach qtds the hc is using */

@@ -456,16 +454,6 @@ qh_completions (struct ehci_hcd *ehci, s

*/

ehci_clear_tt_buffer(ehci, qh, urb, token);

}

-

- /* force halt for unlinked or blocked qh, so we'll

- * patch the qh later and so that completions can't

- * activate it while we "know" it's stopped.

- */

- if ((halt & hw->hw_token) == 0) {

-halt:

- hw->hw_token |= halt;

- wmb ();

- }

}

/* unless we already know the urb's status, collect qtd status