From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 20 Sep 2009 22:57:28 +0000 (-0700)
Subject: loongson: fix cut-and-paste mis-merge
X-Git-Tag: v2.6.32-rc1~624
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=dcbb5593d980bbf4ceef320f8c75210398ed84db;p=profile%2Fcommon%2Fkernel-common.git

loongson: fix cut-and-paste mis-merge

Ingo points out that I screwed up when merging the 'timers-for-linus'
branch in commit a03fdb7612874834d6847107198712d18b5242c7.

A bit too much copy-and-pasting caused the end result to have an
extraneous 'return' in the middle of an expression.  That was obviously
bogus.  Blush.

Reported-by-with-patch: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

diff --git a/arch/mips/loongson/common/time.c b/arch/mips/loongson/common/time.c
index 0edbef3..6e08c82 100644
--- a/arch/mips/loongson/common/time.c
+++ b/arch/mips/loongson/common/time.c
@@ -23,6 +23,6 @@ void __init plat_time_init(void)
 
 void read_persistent_clock(struct timespec *ts)
 {
-	ts->tv_sec = return mc146818_get_cmos_time();
+	ts->tv_sec = mc146818_get_cmos_time();
 	ts->tv_nsec = 0;
 }