diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2010-04-28 12:09:15 -0700 |
|---|---|---|
| committer | Reinette Chatre <reinette.chatre@intel.com> | 2010-05-10 15:08:54 -0700 |
| commit | d1358f62d47c9e872994e5c6e9c9d6e1f31d24c4 (patch) | |
| tree | c9f7a6ef0a71809fdd2c15b15d78872acf805638 /drivers/net/wireless/iwlwifi/iwl-eeprom.c | |
| parent | 22adba2a6995dc24663251ffb954f8856968f26e (diff) | |
| download | kernel_samsung_smdk4412-d1358f62d47c9e872994e5c6e9c9d6e1f31d24c4.zip kernel_samsung_smdk4412-d1358f62d47c9e872994e5c6e9c9d6e1f31d24c4.tar.gz kernel_samsung_smdk4412-d1358f62d47c9e872994e5c6e9c9d6e1f31d24c4.tar.bz2 | |
iwlwifi: move eeprom version printout to eeprom init
It doesn't belong into firmware loading,
it should instead be printed after loading
the EEPROM.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-eeprom.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-eeprom.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-eeprom.c b/drivers/net/wireless/iwlwifi/iwl-eeprom.c index fd37152..a8dd2fd 100644 --- a/drivers/net/wireless/iwlwifi/iwl-eeprom.c +++ b/drivers/net/wireless/iwlwifi/iwl-eeprom.c @@ -589,9 +589,16 @@ int iwl_eeprom_init(struct iwl_priv *priv) e[addr / 2] = cpu_to_le16(r >> 16); } } + + IWL_DEBUG_INFO(priv, "NVM Type: %s, version: 0x%x\n", + (priv->nvm_device_type == NVM_DEVICE_TYPE_OTP) + ? "OTP" : "EEPROM", + iwl_eeprom_query16(priv, EEPROM_VERSION)); + ret = 0; done: priv->cfg->ops->lib->eeprom_ops.release_semaphore(priv); + err: if (ret) iwl_eeprom_free(priv); |