From 42ae2d6a178a9b0ec3462e07fd80818aac50ada4 Mon Sep 17 00:00:00 2001
From: Takashi YOSHII <takashi.yoshii.ze@hitachi.com>
Date: Mon, 12 Mar 2007 15:33:22 +0900
Subject: [PATCH] --- yaml --- r: 54348 b: refs/heads/master c:
 f6072896e3f4c577db7e3a06105ebdfd52d7e7c9 h: refs/heads/master v: v3

---
 [refs]                            |  2 +-
 trunk/arch/sh/drivers/heartbeat.c | 13 +++----------
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index 7b4360c7968e..08120a61efcc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f987fc880d191bf2ef66ac17e9d524aee6afa02e
+refs/heads/master: f6072896e3f4c577db7e3a06105ebdfd52d7e7c9
diff --git a/trunk/arch/sh/drivers/heartbeat.c b/trunk/arch/sh/drivers/heartbeat.c
index bc59cb6cd78b..23dd6080422f 100644
--- a/trunk/arch/sh/drivers/heartbeat.c
+++ b/trunk/arch/sh/drivers/heartbeat.c
@@ -40,16 +40,9 @@ static void heartbeat_timer(unsigned long data)
 	static unsigned bit = 0, up = 1;
 
 	ctrl_outw(1 << hd->bit_pos[bit], (unsigned long)hd->base);
-	if (up)
-		if (bit == (ARRAY_SIZE(hd->bit_pos) - 1)) {
-			bit--;
-			up = 0;
-		} else
-			bit++;
-	else if (bit == 0)
-		up = 1;
-	else
-		bit--;
+	bit += up;
+	if ((bit == 0) || (bit == ARRAY_SIZE(hd->bit_pos)-1))
+		up = -up;
 
 	mod_timer(&hd->timer, jiffies + (110 - ((300 << FSHIFT) /
 			((avenrun[0] / 5) + (3 << FSHIFT)))));