diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-12-11 16:03:03 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-12-11 16:03:03 -0500 |
| commit | ecbbec2eb093d2ef205de371af986f0360fca539 (patch) | |
| tree | 57ab3b0c684f957aee568230fadb32995e00da6b /drivers/net/wireless/iwlwifi/dvm/rxon.c | |
| parent | 36b07d15a656b657beaf9e6357a341768192fad2 (diff) | |
| parent | 25a172655f837bdb032e451f95441bb4acec51bb (diff) | |
| download | blackbird-op-linux-ecbbec2eb093d2ef205de371af986f0360fca539.tar.gz blackbird-op-linux-ecbbec2eb093d2ef205de371af986f0360fca539.zip | |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next
Diffstat (limited to 'drivers/net/wireless/iwlwifi/dvm/rxon.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/dvm/rxon.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwlwifi/dvm/rxon.c b/drivers/net/wireless/iwlwifi/dvm/rxon.c index 2830ea290502..9a891e6e60e8 100644 --- a/drivers/net/wireless/iwlwifi/dvm/rxon.c +++ b/drivers/net/wireless/iwlwifi/dvm/rxon.c @@ -420,10 +420,10 @@ static int iwl_set_tx_power(struct iwl_priv *priv, s8 tx_power, bool force) return -EINVAL; } - if (tx_power > DIV_ROUND_UP(priv->eeprom_data->max_tx_pwr_half_dbm, 2)) { + if (tx_power > DIV_ROUND_UP(priv->nvm_data->max_tx_pwr_half_dbm, 2)) { IWL_WARN(priv, "Requested user TXPOWER %d above upper limit %d.\n", - tx_power, priv->eeprom_data->max_tx_pwr_half_dbm); + tx_power, priv->nvm_data->max_tx_pwr_half_dbm); return -EINVAL; } |
