diff options
| author | JP Abgrall | 2012-02-09 23:24:39 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2012-02-10 19:08:01 +0100 |
| commit | f2d3c6898abd6c5d69e6d1504413434df1ea2538 (patch) | |
| tree | 7862046ff226d1b19109c0a8fb3e25122fa43779 /drivers/staging/android | |
| parent | staging: android-alarm: Update hrtimer if alarm at the head of the queue is r... (diff) | |
| download | kernel-qcow2-linux-f2d3c6898abd6c5d69e6d1504413434df1ea2538.tar.gz kernel-qcow2-linux-f2d3c6898abd6c5d69e6d1504413434df1ea2538.tar.xz kernel-qcow2-linux-f2d3c6898abd6c5d69e6d1504413434df1ea2538.zip | |
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 <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>
Diffstat (limited to 'drivers/staging/android')
| -rw-r--r-- | drivers/staging/android/alarm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/android/alarm.c b/drivers/staging/android/alarm.c index 445c0b12c473..642a22f01c1b 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) |