Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d2e61512 authored Oct 20, 2005 by Kumar Gala Committed by Paul Mackerras Oct 26, 2005

[PATCH] powerpc: Make sure we have an RTC before trying to adjust it



Its valid for ppc_md.set_rtc_time to be NULL.  We need to check
that its non-NULL before trying to update the RTC.

Signed-off-by: Kumar K. Gala <kumar.gala@freescale.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>

parent 34060104

arch/powerpc/kernel/time.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -154,7 +154,7 @@ static __inline__ void timer_check_rtc(void)
		* We should have an rtc call that only sets the minutes and
		* seconds like on Intel to avoid problems with non UTC clocks.
		*/
		if (ntp_synced() &&
		if (ppc_md.set_rtc_time && ntp_synced() &&
		xtime.tv_sec - last_rtc_update >= 659 &&
		abs((xtime.tv_nsec/1000) - (1000000-1000000/HZ)) < 500000/HZ &&
		jiffies - wall_jiffies == 1) {