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

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

@@ -543,6 +543,7 @@ static int ehci_init(struct usb_hcd *hcd

*/

ehci->periodic_size = DEFAULT_I_TDPS;

INIT_LIST_HEAD(&ehci->cached_itd_list);

+ INIT_LIST_HEAD(&ehci->cached_sitd_list);

if ((retval = ehci_mem_init(ehci, GFP_KERNEL)) < 0)

return retval;

@@ -993,7 +994,7 @@ rescan:

/* endpoints can be iso streams. for now, we don't

* accelerate iso completions ... so spin a while.

*/

- if (qh->hw->hw_info1 == 0) {

+ if (qh->hw == NULL) {

ehci_vdbg (ehci, "iso delay\n");

goto idle_timeout;

}

@@ -1007,10 +1008,11 @@ rescan:

tmp && tmp != qh;

tmp = tmp->qh_next.qh)

continue;

- /* periodic qh self-unlinks on empty */

- if (!tmp)

- goto nogood;

- unlink_async (ehci, qh);

+ /* periodic qh self-unlinks on empty, and a COMPLETING qh

+ * may already be unlinked.

+ */

+ if (tmp)

+ unlink_async(ehci, qh);

/* FALL THROUGH */

case QH_STATE_UNLINK: /* wait for hw to finish? */

case QH_STATE_UNLINK_WAIT:

@@ -1027,7 +1029,6 @@ idle_timeout:

}

/* else FALL THROUGH */

default:

-nogood:

/* caller was supposed to have unlinked any requests;

* that's not our job. just leak this memory.

*/