Skip to contentSkip to conversation

rt2x00: Fix rfkill structure initialization to prevent rfkill WARN_ON.

PATCH New Ivo van Doorn 1 participant 1 message Oct 3, 2008 Networking drivers (wireless)

lore
Share & tools
lore

Ivo van Doorn

author
#0 lore raw

PATCH 1/1 rt2x00: Fix rfkill structure initialization to prevent rfkill WARN_ON.

From: Gertjan van Wingerde <[email protected]>

The state field of the rfkill structure was incorrectly initialized to -1, which results in rfkill issueing a WARN_ON. Fix this by initializing the state field to the proper value as indicated by the driver.

Signed-off-by Gertjan van Wingerde <[email protected]>
Signed-off-by Ivo van Doorn <[email protected]>
---
 drivers/net/wireless/rt2x00/rt2x00rfkill.c |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)
drivers/net/wireless/rt2x00/rt2x00rfkill.c +7 -2
index 55eff58..c3f53a9 100644
@@ -145,10 +145,15 @@ void rt2x00rfkill_allocate(struct rt2x00_dev *rt2x00dev)
 
 	rt2x00dev->rfkill->name = rt2x00dev->ops->name;
 	rt2x00dev->rfkill->data = rt2x00dev;
-	rt2x00dev->rfkill->state = -1;
 	rt2x00dev->rfkill->toggle_radio = rt2x00rfkill_toggle_radio;
-	if (test_bit(CONFIG_SUPPORT_HW_BUTTON, &rt2x00dev->flags))
+	if (test_bit(CONFIG_SUPPORT_HW_BUTTON, &rt2x00dev->flags)) {
 		rt2x00dev->rfkill->get_state = rt2x00rfkill_get_state;
+		rt2x00dev->rfkill->state =
+			rt2x00dev->ops->lib->rfkill_poll(rt2x00dev) ?
+			    RFKILL_STATE_SOFT_BLOCKED : RFKILL_STATE_UNBLOCKED;
+	} else {
+		rt2x00dev->rfkill->state = RFKILL_STATE_UNBLOCKED;
+	}
 
 	INIT_DELAYED_WORK(&rt2x00dev->rfkill_work, rt2x00rfkill_poll);
Signature · 1 line
1.5.6.1