From: JP Abgrall Date: Thu, 9 Feb 2012 22:24:39 +0000 (-0800) Subject: staging: android-alarm: Fix bad index when canceling alarms[] X-Git-Tag: v3.4-rc1~186^2~176^2~8 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f2d3c6898abd6c5d69e6d1504413434df1ea2538;p=platform%2Fkernel%2Flinux-exynos.git staging: android-alarm: Fix bad index when canceling alarms[] It was using ANDROID_ALARM_ELAPSED_REALTIME_WAKEUP_MASK as an index. CC: Arve Hjønnevåg CC: Android Kernel Team CC: JP Abgrall Change-Id: I919860cc71254453e382616bce9fd5455802cb3d Signed-off-by: JP Abgrall [jstultz: Tweaked commit subject] Signed-off-by: John Stultz Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/android/alarm.c b/drivers/staging/android/alarm.c index 445c0b1..642a22f 100644 --- a/drivers/staging/android/alarm.c +++ b/drivers/staging/android/alarm.c @@ -400,7 +400,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)