diff options
Diffstat (limited to 'drivers/usb/host/ehci-sh.c')
-rw-r--r-- | drivers/usb/host/ehci-sh.c | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/drivers/usb/host/ehci-sh.c b/drivers/usb/host/ehci-sh.c index e7cb3925abf8..b3f1e3650da0 100644 --- a/drivers/usb/host/ehci-sh.c +++ b/drivers/usb/host/ehci-sh.c | |||
@@ -24,25 +24,11 @@ static int ehci_sh_reset(struct usb_hcd *hcd) | |||
24 | int ret; | 24 | int ret; |
25 | 25 | ||
26 | ehci->caps = hcd->regs; | 26 | ehci->caps = hcd->regs; |
27 | ehci->regs = hcd->regs + HC_LENGTH(ehci, ehci_readl(ehci, | ||
28 | &ehci->caps->hc_capbase)); | ||
29 | 27 | ||
30 | dbg_hcs_params(ehci, "reset"); | 28 | ret = ehci_setup(hcd); |
31 | dbg_hcc_params(ehci, "reset"); | ||
32 | |||
33 | ehci->hcs_params = ehci_readl(ehci, &ehci->caps->hcs_params); | ||
34 | |||
35 | ret = ehci_halt(ehci); | ||
36 | if (unlikely(ret)) | ||
37 | return ret; | ||
38 | |||
39 | ret = ehci_init(hcd); | ||
40 | if (unlikely(ret)) | 29 | if (unlikely(ret)) |
41 | return ret; | 30 | return ret; |
42 | 31 | ||
43 | ehci->sbrn = 0x20; | ||
44 | |||
45 | ehci_reset(ehci); | ||
46 | ehci_port_power(ehci, 0); | 32 | ehci_port_power(ehci, 0); |
47 | 33 | ||
48 | return ret; | 34 | return ret; |