diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-07-16 20:16:09 (GMT) |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-07-16 20:16:09 (GMT) |
| commit | b903bd69e3fa156598def8d6433dfe5352af8da3 (patch) | |
| tree | a13380f31bab62acfd667910656525c09511cb8a /drivers/usb/host/ehci-octeon.c | |
| parent | 84a1caf1453c3d44050bd22db958af4a7f99315c (diff) | |
| parent | 1a49e2ac9651df7349867a5cf44e2c83de1046af (diff) | |
| download | linux-fsl-qoriq-b903bd69e3fa156598def8d6433dfe5352af8da3.tar.xz | |
Merge 3.5-rc7 into usb-next
This resolves the merge issue with the drivers/usb/host/ehci-omap.c
file.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/host/ehci-octeon.c')
| -rw-r--r-- | drivers/usb/host/ehci-octeon.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/usb/host/ehci-octeon.c b/drivers/usb/host/ehci-octeon.c index c010488..ba26957a 100644 --- a/drivers/usb/host/ehci-octeon.c +++ b/drivers/usb/host/ehci-octeon.c @@ -56,7 +56,7 @@ static const struct hc_driver ehci_octeon_hc_driver = { /* * basic lifecycle operations */ - .reset = ehci_init, + .reset = ehci_setup, .start = ehci_run, .stop = ehci_stop, .shutdown = ehci_shutdown, @@ -150,12 +150,6 @@ static int ehci_octeon_drv_probe(struct platform_device *pdev) #endif ehci->caps = hcd->regs; - ehci->regs = hcd->regs + - HC_LENGTH(ehci, ehci_readl(ehci, &ehci->caps->hc_capbase)); - /* cache this readonly data; minimize chip reads */ - ehci->hcs_params = ehci_readl(ehci, &ehci->caps->hcs_params); - - ehci_reset(ehci); ret = usb_add_hcd(hcd, irq, IRQF_SHARED); if (ret) { |