diff options
author | Hiroshi DOYU <Hiroshi.DOYU@nokia.com> | 2009-09-28 12:21:26 -0400 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2009-09-28 12:21:26 -0400 |
commit | 055c49d285a151ccb91d63bac6d8621be3db5c93 (patch) | |
tree | 372a42a8a4245f857acf0b470247bd570481f768 /arch | |
parent | 0fd92a15a01e6a57c1bbc816c574ec135c1c482e (diff) |
omap: Fix wrong condition check in while loop for mailbox and iommu2
It's worked fine so far since reset is done for the first time.
Reported-by: Juha Leppanen <juha_motorsportcom@luukku.com>
Signed-off-by: Hiroshi DOYU <Hiroshi.DOYU@nokia.com>
Signed-off-by: Juha Leppanen <juha_motorsportcom@luukku.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/mach-omap2/iommu2.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-omap2/mailbox.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/iommu2.c b/arch/arm/mach-omap2/iommu2.c index 2d9b5cc981cd..4a0e1cd5c1f4 100644 --- a/arch/arm/mach-omap2/iommu2.c +++ b/arch/arm/mach-omap2/iommu2.c | |||
@@ -79,7 +79,7 @@ static int omap2_iommu_enable(struct iommu *obj) | |||
79 | l = iommu_read_reg(obj, MMU_SYSSTATUS); | 79 | l = iommu_read_reg(obj, MMU_SYSSTATUS); |
80 | if (l & MMU_SYS_RESETDONE) | 80 | if (l & MMU_SYS_RESETDONE) |
81 | break; | 81 | break; |
82 | } while (time_after(jiffies, timeout)); | 82 | } while (!time_after(jiffies, timeout)); |
83 | 83 | ||
84 | if (!(l & MMU_SYS_RESETDONE)) { | 84 | if (!(l & MMU_SYS_RESETDONE)) { |
85 | dev_err(obj->dev, "can't take mmu out of reset\n"); | 85 | dev_err(obj->dev, "can't take mmu out of reset\n"); |
diff --git a/arch/arm/mach-omap2/mailbox.c b/arch/arm/mach-omap2/mailbox.c index f3fefca58494..c035ad3426d0 100644 --- a/arch/arm/mach-omap2/mailbox.c +++ b/arch/arm/mach-omap2/mailbox.c | |||
@@ -93,7 +93,7 @@ static int omap2_mbox_startup(struct omap_mbox *mbox) | |||
93 | l = mbox_read_reg(MAILBOX_SYSSTATUS); | 93 | l = mbox_read_reg(MAILBOX_SYSSTATUS); |
94 | if (l & RESETDONE) | 94 | if (l & RESETDONE) |
95 | break; | 95 | break; |
96 | } while (time_after(jiffies, timeout)); | 96 | } while (!time_after(jiffies, timeout)); |
97 | 97 | ||
98 | if (!(l & RESETDONE)) { | 98 | if (!(l & RESETDONE)) { |
99 | pr_err("Can't take mmu out of reset\n"); | 99 | pr_err("Can't take mmu out of reset\n"); |