diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2016-03-04 18:58:30 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2016-03-04 18:58:30 +1100 |
| commit | e5f569021f4ea758f591c421404c1240ed3daa75 (patch) | |
| tree | d7fe7825e4ac693f37ac2af14406791e9a8f1e1b | |
| parent | 6052620909526367a47db05a135672bd251d9e63 (diff) | |
| parent | fc99d7aa98e3aa3d1debeea420385b6621dfaa43 (diff) | |
| download | linux-next-e5f569021f4ea758f591c421404c1240ed3daa75.tar.gz | |
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) /* |