ath6kl: fix WLAN_ENABLE usage in ath6kl_close()
authorKalle Valo <kvalo@qca.qualcomm.com>
Sun, 30 Oct 2011 19:16:33 +0000 (21:16 +0200)
committerKalle Valo <kvalo@qca.qualcomm.com>
Fri, 11 Nov 2011 10:58:59 +0000 (12:58 +0200)
If ath6kl_init_hw_stop() failed with an error WLAN_ENABLED would not
be cleared. Found during code review and just a theoretical issue.

Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
drivers/net/wireless/ath/ath6kl/main.c

index 717ed22abc31d576375cca3d707e304f1dc6797b..def0b7f29c37d6807ecaf2466f515befda538927 100644 (file)
@@ -1147,7 +1147,6 @@ static int ath6kl_close(struct net_device *dev)
                                              0, 0, 0, 0, 0, 0, 0, 0, 0))
                        return -EIO;
 
-               clear_bit(WLAN_ENABLED, &vif->flags);
        }
 
        ath6kl_cfg80211_scan_complete_event(vif, -ECANCELED);
@@ -1157,6 +1156,8 @@ static int ath6kl_close(struct net_device *dev)
        if (ret)
                return ret;
 
+       clear_bit(WLAN_ENABLED, &vif->flags);
+
        return 0;
 }