From: Mike Frysinger <vapier@gentoo.org>
Date: Mon, 4 Jul 2011 23:25:07 +0000 (-0400)
Subject: Blackfin: jtag-console: fix timer usage
X-Git-Tag: v2011.09-rc1~95^2
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=d8940a654435dfa48013229edf53bd3e353e97c1;p=u-boot

Blackfin: jtag-console: fix timer usage

Reported-by: Graeme Russ <graeme.russ@gmail.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
---

diff --git a/arch/blackfin/cpu/jtag-console.c b/arch/blackfin/cpu/jtag-console.c
index e0f2975603..a77358a88a 100644
--- a/arch/blackfin/cpu/jtag-console.c
+++ b/arch/blackfin/cpu/jtag-console.c
@@ -48,11 +48,11 @@ static inline uint32_t bfin_read_emudat(void)
 static bool jtag_write_emudat(uint32_t emudat)
 {
 	static bool overflowed = false;
-	ulong timeout = get_timer(0) + CONFIG_JTAG_CONSOLE_TIMEOUT;
+	ulong timeout = get_timer(0);
 	while (bfin_read_DBGSTAT() & 0x1) {
 		if (overflowed)
 			return overflowed;
-		if (timeout < get_timer(0))
+		if (get_timer(timeout) > CONFIG_JTAG_CONSOLE_TIMEOUT)
 			overflowed = true;
 	}
 	overflowed = false;