[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>
This commit is contained in:
committed by
Paul Mackerras
parent
340601043d
commit
d2e6151257
@@ -154,7 +154,7 @@ static __inline__ void timer_check_rtc(void)
|
|||||||
* We should have an rtc call that only sets the minutes and
|
* We should have an rtc call that only sets the minutes and
|
||||||
* seconds like on Intel to avoid problems with non UTC clocks.
|
* 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 &&
|
xtime.tv_sec - last_rtc_update >= 659 &&
|
||||||
abs((xtime.tv_nsec/1000) - (1000000-1000000/HZ)) < 500000/HZ &&
|
abs((xtime.tv_nsec/1000) - (1000000-1000000/HZ)) < 500000/HZ &&
|
||||||
jiffies - wall_jiffies == 1) {
|
jiffies - wall_jiffies == 1) {
|
||||||
|
Reference in New Issue
Block a user