diff options
| author | Paul Walmsley <paul@pwsan.com> | 2009-12-09 00:33:16 +0100 |
|---|---|---|
| committer | paul <paul@twilight.(none)> | 2009-12-12 01:00:43 +0100 |
| commit | 6f8b7ff5b01e16a65c3b17865ce047faeca40907 (patch) | |
| tree | ae5ecb4b377588b157c23176cf95a5c9631206ba /arch/arm/mach-omap2/cm.c | |
| parent | OMAP3: PM: Fix for MPU power domain MEM BANK position (diff) | |
| download | linux-6f8b7ff5b01e16a65c3b17865ce047faeca40907.tar.xz linux-6f8b7ff5b01e16a65c3b17865ce047faeca40907.zip | |
OMAP clock/hwmod: fix off-by-one errors
Fix loop bailout off-by-one bugs reported by Juha Leppänen
<juha_motorsportcom@luukku.com>.
This second version incorporates comments from Russell King
<linux@arm.linux.org.uk>. A new macro, 'omap_test_timeout', has
been created, with cleaner code, and existing code has been converted
to use it.
Signed-off-by: Paul Walmsley <paul@pwsan.com>
Cc: Juha Leppänen <juha_motorsportcom@luukku.com>
Cc: Russell King <linux@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-omap2/cm.c')
| -rw-r--r-- | arch/arm/mach-omap2/cm.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/arm/mach-omap2/cm.c b/arch/arm/mach-omap2/cm.c index 8eb2dab8c7db..58e4a1c557d8 100644 --- a/arch/arm/mach-omap2/cm.c +++ b/arch/arm/mach-omap2/cm.c @@ -21,6 +21,8 @@ #include <asm/atomic.h> +#include <plat/common.h> + #include "cm.h" #include "cm-regbits-24xx.h" #include "cm-regbits-34xx.h" @@ -61,9 +63,8 @@ int omap2_cm_wait_module_ready(s16 prcm_mod, u8 idlest_id, u8 idlest_shift) mask = 1 << idlest_shift; /* XXX should be OMAP2 CM */ - while (((cm_read_mod_reg(prcm_mod, cm_idlest_reg) & mask) != ena) && - (i++ < MAX_MODULE_READY_TIME)) - udelay(1); + omap_test_timeout(((cm_read_mod_reg(prcm_mod, cm_idlest_reg) & mask) == ena), + MAX_MODULE_READY_TIME, i); return (i < MAX_MODULE_READY_TIME) ? 0 : -EBUSY; } |