From 16d571968cf0c61950917d6e74321e5e237b68e6 Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Wed, 10 Sep 2008 13:35:08 -0700
Subject: [PATCH] --- yaml --- r: 113115 b: refs/heads/master c:
 90158d84eb20fa15e3c8010b570f3ea2c925121d h: refs/heads/master i:   113113:
 9dfb151ce0135646cd0fda429687fb8a10d6e51f   113111:
 fe4083e56237202f0149bfeb46160750038ce77c v: v3

---
 [refs]                           | 2 +-
 trunk/arch/sparc64/kernel/time.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index cbd64261e426..2c6910851755 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 503acc8a33b1f41a547517c9a592af5e5968f85c
+refs/heads/master: 90158d84eb20fa15e3c8010b570f3ea2c925121d
diff --git a/trunk/arch/sparc64/kernel/time.c b/trunk/arch/sparc64/kernel/time.c
index 8a2fa0eb6602..8d2ca04d309e 100644
--- a/trunk/arch/sparc64/kernel/time.c
+++ b/trunk/arch/sparc64/kernel/time.c
@@ -396,14 +396,14 @@ static unsigned long timer_ticks_per_nsec_quotient __read_mostly;
 int update_persistent_clock(struct timespec now)
 {
 	struct rtc_device *rtc = rtc_class_open("rtc0");
-	int err;
+	int err = -1;
 
 	if (rtc) {
 		err = rtc_set_mmss(rtc, now.tv_sec);
 		rtc_class_close(rtc);
 	}
 
-	return -1;
+	return err;
 }
 
 unsigned long cmos_regs;