aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/rtc
diff options
context:
space:
mode:
authorJP Abgrall <jpa@google.com>2011-09-02 18:14:12 -0700
committerJP Abgrall <jpa@google.com>2011-09-07 19:49:49 -0700
commit692e468137ebb2a31431c4b3fad1dca0a2da7659 (patch)
tree22c7e3eae805d7ad1602cad122f36ea38e720a66 /drivers/rtc
parent07b26cd3da54bf9ff3723805e19bcc2dffb48297 (diff)
downloadkernel_samsung_aries-692e468137ebb2a31431c4b3fad1dca0a2da7659.zip
kernel_samsung_aries-692e468137ebb2a31431c4b3fad1dca0a2da7659.tar.gz
kernel_samsung_aries-692e468137ebb2a31431c4b3fad1dca0a2da7659.tar.bz2
rtc alarm: fix bad index when canceling alarms[]
It was using ANDROID_ALARM_ELAPSED_REALTIME_WAKEUP_MASK as an index. Change-Id: I919860cc71254453e382616bce9fd5455802cb3d Signed-off-by: JP Abgrall <jpa@google.com>
Diffstat (limited to 'drivers/rtc')
-rw-r--r--drivers/rtc/alarm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/rtc/alarm.c b/drivers/rtc/alarm.c
index e0e98dd..28b0df8 100644
--- 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)