diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-03-22 16:05:45 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-03-22 16:05:45 +1100 |
| commit | 73acd93e00518b61288cee58729b5e5edcc847f7 (patch) | |
| tree | e196a4bf8de391b8b0039b94fed0b16d28070bdf /drivers/usb/host/ehci-au1xxx.c | |
| parent | 854cef11e9487f1a82a66804b00a673ee6d57fe3 (diff) | |
| parent | f8c027a27412ddcbf8c754e80b71061eb894c0b8 (diff) | |
Merge branch 'quilt/usb'
Diffstat (limited to 'drivers/usb/host/ehci-au1xxx.c')
| -rw-r--r-- | drivers/usb/host/ehci-au1xxx.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/drivers/usb/host/ehci-au1xxx.c b/drivers/usb/host/ehci-au1xxx.c index e3a74e75e822..7a27b7c4ee84 100644 --- a/drivers/usb/host/ehci-au1xxx.c +++ b/drivers/usb/host/ehci-au1xxx.c @@ -69,6 +69,15 @@ static void au1xxx_stop_ehc(void) au_sync(); } +static int au1xxx_ehci_setup(struct usb_hcd *hcd) +{ + struct ehci_hcd *ehci = hcd_to_ehci(hcd); + int ret = ehci_init(hcd); + + ehci->need_io_watchdog = 0; + return ret; +} + static const struct hc_driver ehci_au1xxx_hc_driver = { .description = hcd_name, .product_desc = "Au1xxx EHCI", @@ -86,7 +95,7 @@ static const struct hc_driver ehci_au1xxx_hc_driver = { * FIXME -- ehci_init() doesn't do enough here. * See ehci-ppc-soc for a complete implementation. */ - .reset = ehci_init, + .reset = au1xxx_ehci_setup, .start = ehci_run, .stop = ehci_stop, .shutdown = ehci_shutdown, |