diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2016-08-12 13:42:38 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2016-08-12 13:42:38 +1000 |
| commit | 01ffcc57a0672a252af497f48c0faacf881ee879 (patch) | |
| tree | 6011f0cc495d5541cdb072848c4909a67683194b /drivers | |
| parent | 5f2a4f4f8381923587cb67aec1a6db1d98ec6ff4 (diff) | |
| parent | 426984db8d86b02990da7a6820e14b575e2abbbc (diff) | |
| download | linux-next-01ffcc57a0672a252af497f48c0faacf881ee879.tar.gz | |
Merge branch 'akpm/master'
Diffstat (limited to 'drivers')
| -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) /* |