From eab418d7ea67e44e6e43b90f0a1b09c776686519 Mon Sep 17 00:00:00 2001
From: Alan Jenkins <alan-jenkins@tuffmail.co.uk>
Date: Sun, 12 Jul 2009 17:03:13 +0100
Subject: [PATCH] --- yaml --- r: 155858 b: refs/heads/master c:
 48ab3578a65c5168ecaaa3b21292b643b7bcc2d5 h: refs/heads/master v: v3

---
 [refs]                  | 2 +-
 trunk/net/rfkill/core.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index f7d43c65e69a..87a4d70b7fb6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8ef86c7bfac5b44529b73b84bc50d3cf574bfb4b
+refs/heads/master: 48ab3578a65c5168ecaaa3b21292b643b7bcc2d5
diff --git a/trunk/net/rfkill/core.c b/trunk/net/rfkill/core.c
index 6896c0b45b4a..2fc4a1724eb8 100644
--- a/trunk/net/rfkill/core.c
+++ b/trunk/net/rfkill/core.c
@@ -549,6 +549,10 @@ void rfkill_set_states(struct rfkill *rfkill, bool sw, bool hw)
 	swprev = !!(rfkill->state & RFKILL_BLOCK_SW);
 	hwprev = !!(rfkill->state & RFKILL_BLOCK_HW);
 	__rfkill_set_sw_state(rfkill, sw);
+	if (hw)
+		rfkill->state |= RFKILL_BLOCK_HW;
+	else
+		rfkill->state &= ~RFKILL_BLOCK_HW;
 
 	spin_unlock_irqrestore(&rfkill->lock, flags);