Skip to content

Commit

Permalink
staging: android-alarm: Fix bad index when canceling alarms[]
Browse files Browse the repository at this point in the history
It was using ANDROID_ALARM_ELAPSED_REALTIME_WAKEUP_MASK as an
index.

CC: Arve Hjønnevåg <arve@android.com>
CC: Android Kernel Team <kernel-team@android.com>
CC: JP Abgrall <jpa@google.com>
Change-Id: I919860cc71254453e382616bce9fd5455802cb3d
Signed-off-by: JP Abgrall <jpa@google.com>
[jstultz: Tweaked commit subject]
Signed-off-by: John Stultz <john.stultz@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
JP Abgrall authored and Greg Kroah-Hartman committed Feb 10, 2012
1 parent 66c4810 commit f2d3c68
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/staging/android/alarm.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit f2d3c68

Please sign in to comment.