]> Git Repo - linux.git/commitdiff
loongson: fix cut-and-paste mis-merge
authorLinus Torvalds <[email protected]>
Sun, 20 Sep 2009 22:57:28 +0000 (15:57 -0700)
committerLinus Torvalds <[email protected]>
Sun, 20 Sep 2009 22:57:28 +0000 (15:57 -0700)
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 <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
arch/mips/loongson/common/time.c

index 0edbef32b8623f6653653359e907911d0dbd7fb7..6e08c8270abe945a2467d148d6cb1615f850b220 100644 (file)
@@ -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;
 }
This page took 0.054212 seconds and 4 git commands to generate.