summaryrefslogtreecommitdiffstats
path: root/arch/sparc64/kernel/time.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2008-09-09 04:53:28 +0200
committerDavid S. Miller <davem@davemloft.net>2008-09-09 04:53:28 +0200
commit088a39623660f2875aaf15649bf663bbb5a8a219 (patch)
treeeef3c9a708f2d00381f3a37c88e8ef5bf79e757d /arch/sparc64/kernel/time.c
parentsparc32: Move sun4d show_leds() out of asm/obio.h (diff)
downloadlinux-088a39623660f2875aaf15649bf663bbb5a8a219.tar.xz
linux-088a39623660f2875aaf15649bf663bbb5a8a219.zip
sparc64: Add missing rtc_close() in update_persistent_clock()
Noticed by David Brownell. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc64/kernel/time.c')
-rw-r--r--arch/sparc64/kernel/time.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/arch/sparc64/kernel/time.c b/arch/sparc64/kernel/time.c
index 226a0042d870..8a2fa0eb6602 100644
--- a/arch/sparc64/kernel/time.c
+++ b/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;
}