[13/12] omap: Fix wrong condition check in while loop for mailbox and iommu2

Commit Message

Tony Lindgren Sept. 28, 2009, 4:39 p.m. UTC

* Tony Lindgren <[e-mail]> [090928 09:28]:
> Here's one more fix for this series.

Correction, there were two patches, one for mailbox and one
for iommu2 with the same fix. Here are both of them merged
into a single patch.

Tony
From 055c49d285a151ccb91d63bac6d8621be3db5c93 Mon Sep 17 00:00:00 2001
From: Hiroshi DOYU <[e-mail]>
Date: Mon, 28 Sep 2009 09:21:26 -0700
Subject: [PATCH] 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 <[e-mail]>
Signed-off-by: Hiroshi DOYU <[e-mail]>
Signed-off-by: Juha Leppanen <[e-mail]>
Signed-off-by: Tony Lindgren <[e-mail]>

Patch

diff --git a/arch/arm/mach-omap2/iommu2.c b/arch/arm/mach-omap2/iommu2.c
index 2d9b5cc..4a0e1cd 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)
 		l = iommu_read_reg(obj, MMU_SYSSTATUS);
 		if (l & MMU_SYS_RESETDONE)
 			break;
-	} while (time_after(jiffies, timeout));
+	} while (!time_after(jiffies, timeout));
 
 	if (!(l & MMU_SYS_RESETDONE)) {
 		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 f3fefca..c035ad3 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)
 		l = mbox_read_reg(MAILBOX_SYSSTATUS);
 		if (l & RESETDONE)
 			break;
-	} while (time_after(jiffies, timeout));
+	} while (!time_after(jiffies, timeout));
 
 	if (!(l & RESETDONE)) {
 		pr_err("Can't take mmu out of reset\n");