From f0dc5ff94ebd987cbabc40f44760fabcff2540ab Mon Sep 17 00:00:00 2001
From: Paul Gortmaker <paul.gortmaker@windriver.com>
Date: Thu, 10 Jul 2008 17:30:48 -0700
Subject: [PATCH] --- yaml --- r: 98848 b: refs/heads/master c:
 61ca9daa2ca3022dc9cb22bd98e69c1b61e412ad h: refs/heads/master v: v3

---
 [refs]                   | 2 +-
 trunk/drivers/char/rtc.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 93db5d31f04e..13ebdad89e64 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ac310bb5db057963548e067037d68c9be41d0dd0
+refs/heads/master: 61ca9daa2ca3022dc9cb22bd98e69c1b61e412ad
diff --git a/trunk/drivers/char/rtc.c b/trunk/drivers/char/rtc.c
index 5f80a9dff573..909cac93fa2a 100644
--- a/trunk/drivers/char/rtc.c
+++ b/trunk/drivers/char/rtc.c
@@ -678,12 +678,13 @@ static int rtc_do_ioctl(unsigned int cmd, unsigned long arg, int kernel)
 		if (arg != (1<<tmp))
 			return -EINVAL;
 
+		rtc_freq = arg;
+
 		spin_lock_irqsave(&rtc_lock, flags);
 		if (hpet_set_periodic_freq(arg)) {
 			spin_unlock_irqrestore(&rtc_lock, flags);
 			return 0;
 		}
-		rtc_freq = arg;
 
 		val = CMOS_READ(RTC_FREQ_SELECT) & 0xf0;
 		val |= (16 - tmp);