diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2016-10-27 14:07:09 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2016-10-27 14:07:09 +1100 |
| commit | 0111c2c9347204f5b69905ab0c20557285c65d23 (patch) | |
| tree | 93940adab86528cf96256227719513c3078736d3 | |
| parent | 8d7793cda75acfa37e07b39c525c25a9e993655c (diff) | |
| parent | 1b97f382c5cf48b9c821ebfd1feab895e99a68b6 (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) /* |