loongson: fix cut-and-paste mis-merge

torvalds · torvalds · commit dcbb5593d980 · 2009-09-20T15:57:28.000-07:00
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>
diff --git 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;
 }

Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,6 @@ void __init plat_time_init(void)`
`23`	`23`
`24`	`24`	`void read_persistent_clock(struct timespec *ts)`
`25`	`25`	`{`
`26`		`- ts->tv_sec = return mc146818_get_cmos_time();`
	`26`	`+ ts->tv_sec = mc146818_get_cmos_time();`
`27`	`27`	`ts->tv_nsec = 0;`
`28`	`28`	`}`