Merge remote-tracking branch 'remotes/aosp/android-3.0' into develop-3.0

[firefly-linux-kernel-4.4.55.git] / drivers / rtc / alarm.c

diff --git a/drivers/rtc/alarm.c b/drivers/rtc/alarm.c
index 9b40adda0132aff16819a079a5f89b840a57a802..2c9492ad38cff94da6fd5e5608e571552b5a546f 100644 (file)
--- a/drivers/rtc/alarm.c
+++ b/drivers/rtc/alarm.c
@@ -389,7 +389,7 @@ static int alarm_suspend(struct platform_device *pdev, pm_message_t state)
 
        hrtimer_cancel(&alarms[ANDROID_ALARM_RTC_WAKEUP].timer);
        hrtimer_cancel(&alarms[
-                       ANDROID_ALARM_ELAPSED_REALTIME_WAKEUP_MASK].timer);
+                       ANDROID_ALARM_ELAPSED_REALTIME_WAKEUP].timer);
 
        tmp_queue = &alarms[ANDROID_ALARM_RTC_WAKEUP];
        if (tmp_queue->first)