diff options
author | Roel Kluin <roel.kluin@gmail.com> | 2009-06-19 21:08:30 -0400 |
---|---|---|
committer | paul <paul@twilight.(none)> | 2009-06-19 21:09:32 -0400 |
commit | 2687069f3ac297b820c58de7222e4d16adbca498 (patch) | |
tree | 8257b9f02f998e9069364508b6a26a8b63b796fb /arch/arm | |
parent | 7b7bcefa35d62fec64c3615a6bef7866f34c7cc9 (diff) |
OMAP2 clock/powerdomain: off by 1 error in loop timeout comparisons
with while (i++ < MAX_CLOCK_ENABLE_WAIT); i can reach MAX_CLOCK_ENABLE_WAIT + 1
after the loop, so if (i == MAX_CLOCK_ENABLE_WAIT) that's still success.
Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
Signed-off-by: Paul Walmsley <paul@pwsan.com>
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/mach-omap2/clock.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-omap2/powerdomain.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/clock.c b/arch/arm/mach-omap2/clock.c index ba528f85749c..b0665f161c03 100644 --- a/arch/arm/mach-omap2/clock.c +++ b/arch/arm/mach-omap2/clock.c | |||
@@ -302,7 +302,7 @@ int omap2_wait_clock_ready(void __iomem *reg, u32 mask, const char *name) | |||
302 | udelay(1); | 302 | udelay(1); |
303 | } | 303 | } |
304 | 304 | ||
305 | if (i < MAX_CLOCK_ENABLE_WAIT) | 305 | if (i <= MAX_CLOCK_ENABLE_WAIT) |
306 | pr_debug("Clock %s stable after %d loops\n", name, i); | 306 | pr_debug("Clock %s stable after %d loops\n", name, i); |
307 | else | 307 | else |
308 | printk(KERN_ERR "Clock %s didn't enable in %d tries\n", | 308 | printk(KERN_ERR "Clock %s didn't enable in %d tries\n", |
diff --git a/arch/arm/mach-omap2/powerdomain.c b/arch/arm/mach-omap2/powerdomain.c index 73e2971b1757..983f1cb676be 100644 --- a/arch/arm/mach-omap2/powerdomain.c +++ b/arch/arm/mach-omap2/powerdomain.c | |||
@@ -1099,7 +1099,7 @@ int pwrdm_wait_transition(struct powerdomain *pwrdm) | |||
1099 | (c++ < PWRDM_TRANSITION_BAILOUT)) | 1099 | (c++ < PWRDM_TRANSITION_BAILOUT)) |
1100 | udelay(1); | 1100 | udelay(1); |
1101 | 1101 | ||
1102 | if (c >= PWRDM_TRANSITION_BAILOUT) { | 1102 | if (c > PWRDM_TRANSITION_BAILOUT) { |
1103 | printk(KERN_ERR "powerdomain: waited too long for " | 1103 | printk(KERN_ERR "powerdomain: waited too long for " |
1104 | "powerdomain %s to complete transition\n", pwrdm->name); | 1104 | "powerdomain %s to complete transition\n", pwrdm->name); |
1105 | return -EAGAIN; | 1105 | return -EAGAIN; |