Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f2d3c689 authored by JP Abgrall's avatar JP Abgrall Committed by Greg Kroah-Hartman
Browse files

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: default avatarJP Abgrall <jpa@google.com>
[jstultz: Tweaked commit subject]
Signed-off-by: default avatarJohn Stultz <john.stultz@linaro.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 66c48107

drivers/staging/android/alarm.c

+1 −1
Original line number Diff line number Diff line
@@ -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)