1 files changed, 9 insertions, 1 deletions

diff --git a/arch/i386/kernel/i8253.c b/arch/i386/kernel/i8253.c
index 5cbb776b3089..10cef5ca8a5b 100644
--- a/arch/i386/kernel/i8253.c
+++ b/arch/i386/kernel/i8253.c
@@ -47,9 +47,17 @@ static void init_pit_timer(enum clock_event_mode mode,
                 outb(LATCH >> 8 , PIT_CH0);     /* MSB */
                 break;
 
-        case CLOCK_EVT_MODE_ONESHOT:
+        /*
+         * Avoid unnecessary state transitions, as it confuses
+         * Geode / Cyrix based boxen.
+         */
         case CLOCK_EVT_MODE_SHUTDOWN:
+                if (evt->mode == CLOCK_EVT_MODE_UNUSED)
+                        break;
         case CLOCK_EVT_MODE_UNUSED:
+                if (evt->mode == CLOCK_EVT_MODE_SHUTDOWN)
+                        break;
+        case CLOCK_EVT_MODE_ONESHOT:
                 /* One shot setup */
                 outb_p(0x38, PIT_MODE);
                 udelay(10);