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

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

diff --git a/drivers/usb/host/ehci-omap.c b/drivers/usb/host/ehci-omap.c
index 627f3a678759a1e007a70a520262a41b48327339..55a57c23dd0feac7a07ce10ff5208900564d696d 100644 (file)
--- a/drivers/usb/host/ehci-omap.c
+++ b/drivers/usb/host/ehci-omap.c
@@ -208,7 +208,7 @@ static int ehci_hcd_omap_probe(struct platform_device *pdev)
        /* we know this is the memory we want, no need to ioremap again */
        omap_ehci->caps = hcd->regs;
        omap_ehci->regs = hcd->regs
-                       + HC_LENGTH(readl(&omap_ehci->caps->hc_capbase));
+               + HC_LENGTH(ehci, readl(&omap_ehci->caps->hc_capbase));
 
        dbg_hcs_params(omap_ehci, "reset");
        dbg_hcc_params(omap_ehci, "reset");