dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

alarmtimer: Make sure we initialize the rtctimer 

jonghwan Choi reported seeing warnings with the alarmtimer
code at suspend/resume time, and pointed out that the
rtctimer isn't being properly initialized.

This patch corrects this issue.

Reported-by: jonghwan Choi <jhbird.choi@gmail.com>
Signed-off-by: John Stultz <john.stultz@linaro.org>
This commit is contained in:
John Stultz 2012-03-23 15:52:25 -07:00
parent 6b43ae8a61
commit ad30dfa94c
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
kernel/time/alarmtimer.c
View File

@ -46,9 +46,10 @@ static struct alarm_base {
static ktime_t freezer_delta;
static DEFINE_SPINLOCK(freezer_delta_lock);
static struct rtc_timer rtctimer;
#ifdef CONFIG_RTC_CLASS
/* rtc timer and device for setting alarm wakeups at suspend */
static struct rtc_timer rtctimer;
static struct rtc_device *rtcdev;
static DEFINE_SPINLOCK(rtcdev_lock);
@ -783,6 +784,8 @@ static int __init alarmtimer_init(void)
.nsleep = alarm_timer_nsleep,
};
rtc_timer_init(&rtctimer, NULL, NULL);
posix_timers_register_clock(CLOCK_REALTIME_ALARM, &alarm_clock);
posix_timers_register_clock(CLOCK_BOOTTIME_ALARM, &alarm_clock);