aboutsummaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorJohn Rigby <john.rigby@linaro.org>2013-01-23 13:54:53 -0700
committerJohn Rigby <john.rigby@linaro.org>2013-01-23 13:55:03 -0700
commitcf2e09a2acdfc57c2133a61d05a4c9e71994b45c (patch)
tree5ab9fadae3611788be58eaff0d5ae205490bde8e /drivers
parent102afa29de951a2aca93e75fa84d596c92634d05 (diff)
downloadu-boot-linaro-stable-cf2e09a2acdfc57c2133a61d05a4c9e71994b45c.tar.gz
Fix rebase error introduced in 63cbf0c63b2013.01.1
Fixes https://bugs.launchpad.net/u-boot-linaro/+bug/1103004 Signed-off-by: John Rigby <john.rigby@linaro.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/usb/host/ehci-exynos.c2
1 files changed, 1 insertions, 1 deletions
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,