summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2008-09-10 22:35:08 +0200
committerDavid S. Miller <davem@davemloft.net>2008-09-10 22:35:08 +0200
commit90158d84eb20fa15e3c8010b570f3ea2c925121d (patch)
tree96ae78c63de912e83374a7dd5df013c63909af7b
parentrtc-bq4802: Fix sparse warnings. (diff)
downloadlinux-90158d84eb20fa15e3c8010b570f3ea2c925121d.tar.xz
linux-90158d84eb20fa15e3c8010b570f3ea2c925121d.zip
sparc64: Fix return value in update_persistent_clock().
Noticed by Stephen Rothwell. Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--arch/sparc64/kernel/time.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/sparc64/kernel/time.c b/arch/sparc64/kernel/time.c
index 8a2fa0eb6602..8d2ca04d309e 100644
--- a/arch/sparc64/kernel/time.c
+++ b/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;