diff options
Diffstat (limited to 'drivers/net/wireless/iwlwifi/dvm/devices.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/dvm/devices.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/wireless/iwlwifi/dvm/devices.c b/drivers/net/wireless/iwlwifi/dvm/devices.c index da5862064195..8c72be3f37c1 100644 --- a/drivers/net/wireless/iwlwifi/dvm/devices.c +++ b/drivers/net/wireless/iwlwifi/dvm/devices.c | |||
@@ -305,8 +305,8 @@ static s32 iwl_temp_calib_to_offset(struct iwl_priv *priv) | |||
305 | { | 305 | { |
306 | u16 temperature, voltage; | 306 | u16 temperature, voltage; |
307 | 307 | ||
308 | temperature = le16_to_cpu(priv->eeprom_data->kelvin_temperature); | 308 | temperature = le16_to_cpu(priv->nvm_data->kelvin_temperature); |
309 | voltage = le16_to_cpu(priv->eeprom_data->kelvin_voltage); | 309 | voltage = le16_to_cpu(priv->nvm_data->kelvin_voltage); |
310 | 310 | ||
311 | /* offset = temp - volt / coeff */ | 311 | /* offset = temp - volt / coeff */ |
312 | return (s32)(temperature - | 312 | return (s32)(temperature - |
@@ -460,13 +460,13 @@ static void iwl6000_nic_config(struct iwl_priv *priv) | |||
460 | break; | 460 | break; |
461 | case IWL_DEVICE_FAMILY_6050: | 461 | case IWL_DEVICE_FAMILY_6050: |
462 | /* Indicate calibration version to uCode. */ | 462 | /* Indicate calibration version to uCode. */ |
463 | if (priv->eeprom_data->calib_version >= 6) | 463 | if (priv->nvm_data->calib_version >= 6) |
464 | iwl_set_bit(priv->trans, CSR_GP_DRIVER_REG, | 464 | iwl_set_bit(priv->trans, CSR_GP_DRIVER_REG, |
465 | CSR_GP_DRIVER_REG_BIT_CALIB_VERSION6); | 465 | CSR_GP_DRIVER_REG_BIT_CALIB_VERSION6); |
466 | break; | 466 | break; |
467 | case IWL_DEVICE_FAMILY_6150: | 467 | case IWL_DEVICE_FAMILY_6150: |
468 | /* Indicate calibration version to uCode. */ | 468 | /* Indicate calibration version to uCode. */ |
469 | if (priv->eeprom_data->calib_version >= 6) | 469 | if (priv->nvm_data->calib_version >= 6) |
470 | iwl_set_bit(priv->trans, CSR_GP_DRIVER_REG, | 470 | iwl_set_bit(priv->trans, CSR_GP_DRIVER_REG, |
471 | CSR_GP_DRIVER_REG_BIT_CALIB_VERSION6); | 471 | CSR_GP_DRIVER_REG_BIT_CALIB_VERSION6); |
472 | iwl_set_bit(priv->trans, CSR_GP_DRIVER_REG, | 472 | iwl_set_bit(priv->trans, CSR_GP_DRIVER_REG, |