diff options
| author | David S. Miller <davem@davemloft.net> | 2009-10-12 02:15:47 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-10-12 02:15:47 -0400 |
| commit | 7fe13c5733790ef582769a54693fa6a5abf3c032 (patch) | |
| tree | 567eb4394b642ddc81ff05521329d75d1cf47b88 /drivers/net/wireless/iwlwifi/iwl-5000.c | |
| parent | 8aa0f64ac3835a6daf84d0b0e07c4c01d7d8eddc (diff) | |
| parent | 10c435f18b8cb78a5870c08d52955594f5ec9c31 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-5000.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-5000.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-5000.c b/drivers/net/wireless/iwlwifi/iwl-5000.c index 98baf8af6da8..8cc3d50e7f59 100644 --- a/drivers/net/wireless/iwlwifi/iwl-5000.c +++ b/drivers/net/wireless/iwlwifi/iwl-5000.c | |||
| @@ -283,7 +283,7 @@ static void iwl5000_gain_computation(struct iwl_priv *priv, | |||
| 283 | (s32)average_noise[i])) / 1500; | 283 | (s32)average_noise[i])) / 1500; |
| 284 | /* bound gain by 2 bits value max, 3rd bit is sign */ | 284 | /* bound gain by 2 bits value max, 3rd bit is sign */ |
| 285 | data->delta_gain_code[i] = | 285 | data->delta_gain_code[i] = |
| 286 | min(abs(delta_g), CHAIN_NOISE_MAX_DELTA_GAIN_CODE); | 286 | min(abs(delta_g), (long) CHAIN_NOISE_MAX_DELTA_GAIN_CODE); |
| 287 | 287 | ||
| 288 | if (delta_g < 0) | 288 | if (delta_g < 0) |
| 289 | /* set negative sign */ | 289 | /* set negative sign */ |