From: Linus Torvalds Date: Sun, 20 Sep 2009 22:57:28 +0000 (-0700) Subject: loongson: fix cut-and-paste mis-merge X-Git-Tag: firefly_0821_release~12904 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=dcbb5593d980bbf4ceef320f8c75210398ed84db;p=firefly-linux-kernel-4.4.55.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 Signed-off-by: Linus Torvalds --- diff --git a/arch/mips/loongson/common/time.c b/arch/mips/loongson/common/time.c index 0edbef32b862..6e08c8270abe 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; }