Merge branch 'for-3.1' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/asoc...

[~andy/linux] / drivers / usb / host / ehci-q.c

diff --git a/drivers/usb/host/ehci-q.c b/drivers/usb/host/ehci-q.c
index 42abd0f603bfbcd4291c78b0768b2d552b029500..5d6bc624c961ae96b6f76447d04b432a948e9de9 100644 (file)
--- a/drivers/usb/host/ehci-q.c
+++ b/drivers/usb/host/ehci-q.c
@@ -826,6 +826,7 @@ qh_make (
                                is_input, 0,
                                hb_mult(maxp) * max_packet(maxp)));
                qh->start = NO_FRAME;
+               qh->stamp = ehci->periodic_stamp;
 
                if (urb->dev->speed == USB_SPEED_HIGH) {
                        qh->c_usecs = 0;
@@ -1183,6 +1184,10 @@ static void end_unlink_async (struct ehci_hcd *ehci)
                ehci->reclaim = NULL;
                start_unlink_async (ehci, next);
        }
+
+       if (ehci->has_synopsys_hc_bug)
+               ehci_writel(ehci, (u32) ehci->async->qh_dma,
+                           &ehci->regs->async_next);
 }
 
 /* makes sure the async qh will become idle */