From cf2e09a2acdfc57c2133a61d05a4c9e71994b45c Mon Sep 17 00:00:00 2001 From: John Rigby Date: Wed, 23 Jan 2013 13:54:53 -0700 Subject: Fix rebase error introduced in 63cbf0c63b Fixes https://bugs.launchpad.net/u-boot-linaro/+bug/1103004 Signed-off-by: John Rigby --- drivers/usb/host/ehci-exynos.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers') diff --git a/drivers/usb/host/ehci-exynos.c b/drivers/usb/host/ehci-exynos.c index 28d6d1d19..c484fa775 100644 --- a/drivers/usb/host/ehci-exynos.c +++ b/drivers/usb/host/ehci-exynos.c @@ -130,7 +130,7 @@ int ehci_hcd_init(int index, struct ehci_hccr **hccr, struct ehci_hcor **hcor) s5p_gpio_direction_output(&gpio->d1, 7, 1); *hccr = (struct ehci_hccr *)samsung_get_base_usb_ehci(); - *hcor = (struct ehci_hcor *)((uint32_t) hccr + *hcor = (struct ehci_hcor *)((uint32_t) *hccr + HC_LENGTH(ehci_readl(&(*hccr)->cr_capbase))); debug("Exynos5-ehci: init hccr %x and hcor %x hc_length %d\n", (uint32_t)*hccr, (uint32_t)*hcor, -- cgit v1.2.3