---

yaml --- r: 113111 b: refs/heads/master c: 088a396 h: refs/heads/master i: 113109: 6587705 113107: 4b2b2f2 113103: 866acb2 v: v3
git-mirror · Sep 9, 2008 · fe4083e · fe4083e
1 parent 3a950a8
commit fe4083e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7b1af32f52077402157f8bb8fc22d8da17606095
+refs/heads/master: 088a39623660f2875aaf15649bf663bbb5a8a219
diff --git a/trunk/arch/sparc64/kernel/time.c b/trunk/arch/sparc64/kernel/time.c
@@ -396,9 +396,12 @@ 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;
 
-	if (rtc)
-		return rtc_set_mmss(rtc, now.tv_sec);
+	if (rtc) {
+		err = rtc_set_mmss(rtc, now.tv_sec);
+		rtc_class_close(rtc);
+	}
 
 	return -1;
 }