diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2017-03-03 17:39:23 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-03-03 17:39:23 -0800 |
| commit | 085e1089108ac7d553a4595a2eaa099a35696cfc (patch) | |
| tree | 3e08539e3d2e052f68fc7e9e7e31fa8328491ba7 /kernel | |
| parent | 6897134f7409d531a7cc53614773d74d54e6a3be (diff) | |
| parent | 738d2a8feabb9dfce7595ad7db045d5442ac289c (diff) | |
Merge "alarmtimer: Program mpm wakeup time in milliseconds"
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/time/alarmtimer.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/kernel/time/alarmtimer.c b/kernel/time/alarmtimer.c index 0cdc34ebd8d1..2af5687b83c9 100644 --- a/kernel/time/alarmtimer.c +++ b/kernel/time/alarmtimer.c @@ -412,12 +412,10 @@ static int alarmtimer_suspend(struct device *dev) now = rtc_tm_to_ktime(tm); now = ktime_add(now, min); if (poweron_alarm) { - struct rtc_time tm_val; - unsigned long secs; + uint64_t msec = 0; - tm_val = rtc_ktime_to_tm(min); - rtc_tm_to_time(&tm_val, &secs); - lpm_suspend_wake_time(secs); + msec = ktime_to_ms(min); + lpm_suspend_wake_time(msec); } else { /* Set alarm, if in the past reject suspend briefly to handle */ ret = rtc_timer_start(rtc, &rtctimer, now, ktime_set(0, 0)); |
