From fe4083e56237202f0149bfeb46160750038ce77c Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Mon, 8 Sep 2008 19:53:28 -0700 Subject: [PATCH] --- yaml --- r: 113111 b: refs/heads/master c: 088a39623660f2875aaf15649bf663bbb5a8a219 h: refs/heads/master i: 113109: 65877051b038ca5b4955d56fd27b3de746c58ae4 113107: 4b2b2f25b1cdbfaa78ddd23d261ac44e7773a3db 113103: 866acb20fd4507e2954de92474ecc3eb1b25fa4b v: v3 --- [refs] | 2 +- trunk/arch/sparc64/kernel/time.c | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index dd459cba8894..bc6058958cbf 100644 --- 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 index 226a0042d870..8a2fa0eb6602 100644 --- 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; }