diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2016-10-18 13:02:58 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2016-10-18 13:02:58 +1100 |
| commit | fca110a9e671a1ff53ec959c2a0f50f3eaa35a9a (patch) | |
| tree | c3849fea3d42fcb939eefee63791f60152b48489 | |
| parent | 851a5fbc3715aee12fb50074636a1b52b7ae0ad8 (diff) | |
| parent | afb7b3b92f421ce6bb557294177933fab8c6ed09 (diff) | |
Merge branch 'akpm/master'
| -rw-r--r-- | drivers/net/wireless/intel/iwlwifi/dvm/calib.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/dvm/calib.c b/drivers/net/wireless/intel/iwlwifi/dvm/calib.c index e9cef9de9ed8..c96f9b1d948a 100644 --- a/drivers/net/wireless/intel/iwlwifi/dvm/calib.c +++ b/drivers/net/wireless/intel/iwlwifi/dvm/calib.c @@ -900,8 +900,7 @@ static void iwlagn_gain_computation(struct iwl_priv *priv, /* bound gain by 2 bits value max, 3rd bit is sign */ data->delta_gain_code[i] = - min(abs(delta_g), - (s32) CHAIN_NOISE_MAX_DELTA_GAIN_CODE); + min(abs(delta_g), CHAIN_NOISE_MAX_DELTA_GAIN_CODE); if (delta_g < 0) /* |