diff options
| author | David S. Miller <davem@davemloft.net> | 2010-05-17 21:09:11 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-05-17 21:09:11 -0700 |
| commit | 820ae8a80eb59962aefbbd4908dfe144ec0f9edb (patch) | |
| tree | 6c0f7356afff14e1c7d266de644810cd2de7caa9 /drivers/net/wireless/iwlwifi/iwl-eeprom.c | |
| parent | 380fefb2ddabd4cd5f14dbe090481f0544e65078 (diff) | |
| parent | 6fe70aae0d128339febfabc073ba4c4a03de4f45 (diff) | |
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
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 fb5bb487f3bc..ee11452519e6 100644 --- a/drivers/net/wireless/iwlwifi/iwl-eeprom.c +++ b/drivers/net/wireless/iwlwifi/iwl-eeprom.c @@ -590,9 +590,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); |