diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-03-11 02:10:07 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-03-11 02:10:07 -0400 |
| commit | e14eee56c2280953c6e3d24d5dce42bd90836b81 (patch) | |
| tree | 21ab792d9ad6fbbab460058f352a0158f995644e /drivers/usb/host/ehci-hcd.c | |
| parent | d6ee6f7e4c74d9a0fed7544f4d389bde004651d3 (diff) | |
| parent | 99adcd9d67aaf04e28f5ae96df280f236bde4b66 (diff) | |
Merge commit 'origin/master' into next
Diffstat (limited to 'drivers/usb/host/ehci-hcd.c')
| -rw-r--r-- | drivers/usb/host/ehci-hcd.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c index 4725d15d096f..e551bb38852b 100644 --- a/drivers/usb/host/ehci-hcd.c +++ b/drivers/usb/host/ehci-hcd.c | |||
| @@ -485,6 +485,7 @@ static int ehci_init(struct usb_hcd *hcd) | |||
| 485 | * periodic_size can shrink by USBCMD update if hcc_params allows. | 485 | * periodic_size can shrink by USBCMD update if hcc_params allows. |
| 486 | */ | 486 | */ |
| 487 | ehci->periodic_size = DEFAULT_I_TDPS; | 487 | ehci->periodic_size = DEFAULT_I_TDPS; |
| 488 | INIT_LIST_HEAD(&ehci->cached_itd_list); | ||
| 488 | if ((retval = ehci_mem_init(ehci, GFP_KERNEL)) < 0) | 489 | if ((retval = ehci_mem_init(ehci, GFP_KERNEL)) < 0) |
| 489 | return retval; | 490 | return retval; |
| 490 | 491 | ||
| @@ -497,6 +498,7 @@ static int ehci_init(struct usb_hcd *hcd) | |||
| 497 | 498 | ||
| 498 | ehci->reclaim = NULL; | 499 | ehci->reclaim = NULL; |
| 499 | ehci->next_uframe = -1; | 500 | ehci->next_uframe = -1; |
| 501 | ehci->clock_frame = -1; | ||
| 500 | 502 | ||
| 501 | /* | 503 | /* |
| 502 | * dedicate a qh for the async ring head, since we couldn't unlink | 504 | * dedicate a qh for the async ring head, since we couldn't unlink |