From ccb741d7847dfc39b4cfbedb7dc5e2b6bc3de6ab Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Sat, 21 Jul 2007 04:37:38 -0700
Subject: [PATCH] --- yaml --- r: 62323 b: refs/heads/master c:
 7671988b9cd31daf53fd38f8e75c8b881324842b h: refs/heads/master i:   62321:
 63f9a55f4b99fef6efdf5c9eb148bd27085a3194   62319:
 ea44fe4922615737402dcec5af1063bc7d5a134c v: v3

---
 [refs]                         | 2 +-
 trunk/arch/i386/kernel/i8253.c | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 68a9056ce0b1..68fd0fea8402 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 82644459c592a28a3eab682f9b88d81019ddfe8b
+refs/heads/master: 7671988b9cd31daf53fd38f8e75c8b881324842b
diff --git a/trunk/arch/i386/kernel/i8253.c b/trunk/arch/i386/kernel/i8253.c
index 931eabe1e560..bde249dda94d 100644
--- a/trunk/arch/i386/kernel/i8253.c
+++ b/trunk/arch/i386/kernel/i8253.c
@@ -47,9 +47,12 @@ static void init_pit_timer(enum clock_event_mode mode,
 
 	case CLOCK_EVT_MODE_SHUTDOWN:
 	case CLOCK_EVT_MODE_UNUSED:
-		outb_p(0x30, PIT_MODE);
-		outb_p(0, PIT_CH0);	/* LSB */
-		outb_p(0, PIT_CH0);	/* MSB */
+		if (evt->mode == CLOCK_EVT_MODE_PERIODIC ||
+		    evt->mode == CLOCK_EVT_MODE_ONESHOT) {
+			outb_p(0x30, PIT_MODE);
+			outb_p(0, PIT_CH0);
+			outb_p(0, PIT_CH0);
+		}
 		break;
 
 	case CLOCK_EVT_MODE_ONESHOT: