Skip to content

Commit

Permalink
loongson: fix cut-and-paste mis-merge
Browse files Browse the repository at this point in the history
Ingo points out that I screwed up when merging the 'timers-for-linus'
branch in commit a03fdb7.

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>
  • Loading branch information
Linus Torvalds committed Sep 20, 2009
1 parent 996a798 commit dcbb559
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion arch/mips/loongson/common/time.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

0 comments on commit dcbb559

Please sign in to comment.