From 7b4b6238f8d8ee7737c6ced70f451cd7ae39089d Mon Sep 17 00:00:00 2001
From: Johannes Berg <johannes@sipsolutions.net>
Date: Wed, 3 Jun 2009 09:55:29 +0200
Subject: [PATCH] --- yaml --- r: 150694 b: refs/heads/master c:
 2ec2c68c11af95075f29e370970eb97c89234e2e h: refs/heads/master v: v3

---
 [refs]                  |  2 +-
 trunk/net/rfkill/core.c | 13 ++++++-------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 85a6e1146dd9..0793236cf3d7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 72828b1b3cabecfce4321877aa526a2bd21acf0c
+refs/heads/master: 2ec2c68c11af95075f29e370970eb97c89234e2e
diff --git a/trunk/net/rfkill/core.c b/trunk/net/rfkill/core.c
index 91e9168b5447..11b7314723df 100644
--- a/trunk/net/rfkill/core.c
+++ b/trunk/net/rfkill/core.c
@@ -909,16 +909,15 @@ int __must_check rfkill_register(struct rfkill *rfkill)
 
 	rfkill->registered = true;
 
-	if (rfkill->ops->poll) {
-		INIT_DELAYED_WORK(&rfkill->poll_work, rfkill_poll);
-		schedule_delayed_work(&rfkill->poll_work,
-			round_jiffies_relative(POLL_INTERVAL));
-	}
-
+	INIT_DELAYED_WORK(&rfkill->poll_work, rfkill_poll);
 	INIT_WORK(&rfkill->uevent_work, rfkill_uevent_work);
-
 	INIT_WORK(&rfkill->sync_work, rfkill_sync_work);
+
+	if (rfkill->ops->poll)
+		schedule_delayed_work(&rfkill->poll_work,
+			round_jiffies_relative(POLL_INTERVAL));
 	schedule_work(&rfkill->sync_work);
+
 	rfkill_send_events(rfkill, RFKILL_OP_ADD);
 
 	mutex_unlock(&rfkill_global_mutex);