diff --git a/[refs] b/[refs]
index 41e6a3b30f51..1c0024df6d70 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 66c48107719b751e8ec360034bc84ee1511147e4
+refs/heads/master: f2d3c6898abd6c5d69e6d1504413434df1ea2538
diff --git a/trunk/drivers/staging/android/alarm.c b/trunk/drivers/staging/android/alarm.c
index 445c0b12c473..642a22f01c1b 100644
--- a/trunk/drivers/staging/android/alarm.c
+++ b/trunk/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)