diff options
author | Don Fry <donald.h.fry@intel.com> | 2012-03-07 12:52:43 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2012-03-08 14:02:29 -0500 |
commit | 1353a7ba7ebe62dedc60a5ba75c434cfad960ede (patch) | |
tree | 7ce5d4c7e7095f951f3d708da8755762ac3ac253 /drivers/net/wireless/iwlwifi/iwl-agn.c | |
parent | 974205153be8944539890084a170e3ad407164bc (diff) |
iwlwifi: correct status bit refactoring errors
I missed a couple of status bits in my refactoring changes. This
fixes the ones I missed.
Signed-off-by: Don Fry <donald.h.fry@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-agn.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-agn.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c index 8c21db81ba5f..60f1dc640c94 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn.c | |||
@@ -819,15 +819,15 @@ void iwl_down(struct iwl_priv *priv) | |||
819 | iwl_trans_stop_device(trans(priv)); | 819 | iwl_trans_stop_device(trans(priv)); |
820 | 820 | ||
821 | /* Clear out all status bits but a few that are stable across reset */ | 821 | /* Clear out all status bits but a few that are stable across reset */ |
822 | priv->shrd->status &= | 822 | priv->status &= test_bit(STATUS_RF_KILL_HW, &priv->status) << |
823 | test_bit(STATUS_RF_KILL_HW, &priv->status) << | ||
824 | STATUS_RF_KILL_HW | | 823 | STATUS_RF_KILL_HW | |
825 | test_bit(STATUS_GEO_CONFIGURED, &priv->status) << | 824 | test_bit(STATUS_GEO_CONFIGURED, &priv->status) << |
826 | STATUS_GEO_CONFIGURED | | 825 | STATUS_GEO_CONFIGURED | |
827 | test_bit(STATUS_FW_ERROR, &priv->shrd->status) << | ||
828 | STATUS_FW_ERROR | | ||
829 | test_bit(STATUS_EXIT_PENDING, &priv->status) << | 826 | test_bit(STATUS_EXIT_PENDING, &priv->status) << |
830 | STATUS_EXIT_PENDING; | 827 | STATUS_EXIT_PENDING; |
828 | priv->shrd->status &= | ||
829 | test_bit(STATUS_FW_ERROR, &priv->shrd->status) << | ||
830 | STATUS_FW_ERROR; | ||
831 | 831 | ||
832 | dev_kfree_skb(priv->beacon_skb); | 832 | dev_kfree_skb(priv->beacon_skb); |
833 | priv->beacon_skb = NULL; | 833 | priv->beacon_skb = NULL; |