From 6c207cd3edc45f4574a412bfd6b7ff8ce7cae56d Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Wed, 10 Sep 2008 13:36:13 -0700
Subject: [PATCH] --- yaml --- r: 113116 b: refs/heads/master c:
 ab138c031f72f6d030afa1a06a3a537e85ae843e h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 2c6910851755..351b40790c8f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 90158d84eb20fa15e3c8010b570f3ea2c925121d
+refs/heads/master: ab138c031f72f6d030afa1a06a3a537e85ae843e
diff --git a/trunk/arch/sparc/kernel/time.c b/trunk/arch/sparc/kernel/time.c
index 698c45059fa5..fa54d585f558 100644
--- a/trunk/arch/sparc/kernel/time.c
+++ b/trunk/arch/sparc/kernel/time.c
@@ -337,9 +337,12 @@ static int sbus_do_settimeofday(struct timespec *tv)
 static int set_rtc_mmss(unsigned long secs)
 {
 	struct rtc_device *rtc = rtc_class_open("rtc0");
+	int err = -1;
 
-	if (rtc)
-		return rtc_set_mmss(rtc, secs);
+	if (rtc) {
+		err = rtc_set_mmss(rtc, secs);
+		rtc_class_close(rtc);
+	}
 
-	return -1;
+	return err;
 }