diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-06-17 13:44:01 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-06-17 13:44:01 -0400 |
| commit | 722a300bf84ebebe21da164e75024c0ce7ca1868 (patch) | |
| tree | 8cb886d70ce00fe0741bb1a61ba6d86bc2136bb8 /drivers/net/wireless/iwlwifi/dvm/rxon.c | |
| parent | 8177a9d79c0e942dcac3312f15585d0344d505a5 (diff) | |
| parent | fcb3701849957917a234a61b58ad70ed35c83eda (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
Diffstat (limited to 'drivers/net/wireless/iwlwifi/dvm/rxon.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/dvm/rxon.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/dvm/rxon.c b/drivers/net/wireless/iwlwifi/dvm/rxon.c index 707446fa00bd..cd1ad0019185 100644 --- a/drivers/net/wireless/iwlwifi/dvm/rxon.c +++ b/drivers/net/wireless/iwlwifi/dvm/rxon.c @@ -1378,7 +1378,7 @@ static void iwlagn_chain_noise_reset(struct iwl_priv *priv) struct iwl_chain_noise_data *data = &priv->chain_noise_data; int ret; - if (!(priv->calib_disabled & IWL_CHAIN_NOISE_CALIB_DISABLED)) + if (priv->calib_disabled & IWL_CHAIN_NOISE_CALIB_DISABLED) return; if ((data->state == IWL_CHAIN_NOISE_ALIVE) && |