Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5b5d13af authored by Gertjan van Wingerde's avatar Gertjan van Wingerde Committed by John W. Linville
Browse files

rt2x00: Fix rfkill structure initialization to prevent rfkill WARN_ON. 



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: default avatarGertjan van Wingerde <gwingerde@kpnplanet.nl>
Signed-off-by: default avatarIvo van Doorn <IvDoorn@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent f74b6a54

drivers/net/wireless/rt2x00/rt2x00rfkill.c

+7 −2
Original line number Diff line number Diff line
@@ -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);