brcmsmac: don't start device when RfKill is engaged

This patch fixes a bug when device is being started
while RfKill switch is engaged, leading to hang
due to partial initialization of hardware.

Tested-by: <[email protected]>
Reviewed-by: Arend van Spriel <[email protected]>
Reviewed-by: Hante Meuleman <[email protected]>
Signed-off-by: Piotr Haber <[email protected]>
Signed-off-by: Arend van Spriel <[email protected]>
Signed-off-by: John W. Linville <[email protected]>

diff --git a/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c b/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
index 718da8d6d6583f1e148e9f927cbf912322007a0b..a744ea5a95599797023a0040401ab1816855f77f 100644 (file)
--- a/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
+++ b/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
@@ -304,7 +304,10 @@ static int brcms_ops_start(struct ieee80211_hw *hw)
        wl->mute_tx = true;
 
        if (!wl->pub->up)
-               err = brcms_up(wl);
+               if (!blocked)
+                       err = brcms_up(wl);
+               else
+                       err = -ERFKILL;
        else
                err = -ENODEV;
        spin_unlock_bh(&wl->lock);