---

yaml --- r: 350260 b: refs/heads/master c: ba0c96c h: refs/heads/master v: v3
git-mirror · Dec 28, 2012 · 3bfc01a · 3bfc01a
1 parent c5e0039
commit 3bfc01a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 02957f92bcc96be5c84a4000f9d22c592158602e
+refs/heads/master: ba0c96cd9a361693b0bae409510d614dc0e26d0f
diff --git a/trunk/net/rfkill/input.c b/trunk/net/rfkill/input.c
@@ -148,11 +148,9 @@ static unsigned long rfkill_ratelimit(const unsigned long last)
 
 static void rfkill_schedule_ratelimited(void)
 {
-	if (delayed_work_pending(&rfkill_op_work))
-		return;
-	schedule_delayed_work(&rfkill_op_work,
-			      rfkill_ratelimit(rfkill_last_scheduled));
-	rfkill_last_scheduled = jiffies;
+	if (schedule_delayed_work(&rfkill_op_work,
+				  rfkill_ratelimit(rfkill_last_scheduled)))
+		rfkill_last_scheduled = jiffies;
 }
 
 static void rfkill_schedule_global_op(enum rfkill_sched_op op)