Commit 588d9eba authored Aug 25, 2014 by Linux Build Service Account Committed by Gerrit - the friendly Code Review server Aug 25, 2014

Merge "rtc: alarm: set power_on_alarm again when calling alarmtimer_resume"

kernel/time/alarmtimer.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -365,6 +365,8 @@ static int alarmtimer_resume(struct device *dev)
		if (!rtc)
		return 0;
		rtc_timer_cancel(rtc, &rtctimer);

		set_power_on_alarm(power_on_alarm , 1);
		return 0;
		}
		#else