Merge "rtc: alarm: init power_on_alarm_lock mutex in alarmtimer_rtc_timer_init" (8991f5c5) · Commits · e / devices / android_kernel_sony_msm8994

kernel/time/alarmtimer.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -181,6 +181,8 @@ static void alarmtimer_rtc_remove_device(struct device *dev,

		static inline void alarmtimer_rtc_timer_init(void)
		{
		mutex_init(&power_on_alarm_lock);

		rtc_timer_init(&rtctimer, NULL, NULL);
		}

		@@ -897,7 +899,6 @@ static int __init alarmtimer_init(void)
		.nsleep = alarm_timer_nsleep,
		};

		mutex_init(&power_on_alarm_lock);
		alarmtimer_rtc_timer_init();

		posix_timers_register_clock(CLOCK_REALTIME_ALARM, &alarm_clock);