diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2013-06-25 12:20:16 +0200 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2013-06-25 12:20:16 +0200 |
| commit | 9277326e1e5d395397fbe20c0f310cf30bfbacc2 (patch) | |
| tree | dc60601afda52bf7059d0b06781a3b2cdf26ed96 /drivers/net/wireless/iwlwifi/dvm/rxon.c | |
| parent | cfb4e624314b657ea5831505a380d932f3313a7a (diff) | |
| parent | 9fbdc75116f7a2b183464d42f3abccb616584105 (diff) | |
Merge remote-tracking branch 'wireless-next/master' into iwlwifi-next
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) && |