---

yaml
---
r: 289071
b: refs/heads/master
c: 66c4810
h: refs/heads/master
i:
  289069: 8188f6f
  289067: f9ea09b
  289063: 8190693
  289055: 0c25071
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 58a38ff3b12ebd103e3ca2c5dea3292ffbfd0f02
+refs/heads/master: 66c48107719b751e8ec360034bc84ee1511147e4

trunk/drivers/staging/android/alarm.c

@@ -119,12 +119,15 @@ static void alarm_enqueue_locked(struct android_alarm *alarm)
 	struct rb_node *parent = NULL;
 	struct android_alarm *entry;
 	int leftmost = 1;
+	bool was_first = false;
 
 	pr_alarm(FLOW, "added alarm, type %d, func %pF at %lld\n",
 		alarm->type, alarm->function, ktime_to_ns(alarm->expires));
 
-	if (base->first == &alarm->node)
+	if (base->first == &alarm->node) {
 		base->first = rb_next(&alarm->node);
+		was_first = true;
+	}
 	if (!RB_EMPTY_NODE(&alarm->node)) {
 		rb_erase(&alarm->node, &base->alarms);
 		RB_CLEAR_NODE(&alarm->node);
@@ -144,10 +147,10 @@ static void alarm_enqueue_locked(struct android_alarm *alarm)
 			leftmost = 0;
 		}
 	}
-	if (leftmost) {
+	if (leftmost)
 		base->first = &alarm->node;
-		update_timer_locked(base, false);
-	}
+	if (leftmost || was_first)
+		update_timer_locked(base, was_first);
 
 	rb_link_node(&alarm->node, parent, link);
 	rb_insert_color(&alarm->node, &base->alarms);