---

yaml --- r: 155858 b: refs/heads/master c: 48ab357 h: refs/heads/master v: v3
git-mirror · Jul 21, 2009 · eab418d · eab418d
1 parent 0ab96f6
commit eab418d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git 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
@@ -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);