From: Kalle Valo Date: Sun, 30 Oct 2011 19:16:33 +0000 (+0200) Subject: ath6kl: fix WLAN_ENABLE usage in ath6kl_close() X-Git-Tag: firefly_0821_release~3680^2~2381^2~57^2~287^2~265 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=68469341f32b566481bfccb776ee03146b63bae5;p=firefly-linux-kernel-4.4.55.git ath6kl: fix WLAN_ENABLE usage in ath6kl_close() 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 --- diff --git a/drivers/net/wireless/ath/ath6kl/main.c b/drivers/net/wireless/ath/ath6kl/main.c index 717ed22abc31..def0b7f29c37 100644 --- a/drivers/net/wireless/ath/ath6kl/main.c +++ b/drivers/net/wireless/ath/ath6kl/main.c @@ -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; }