diff options
| author | Tomas Winkler <tomas.winkler@intel.com> | 2008-04-23 17:14:55 -0700 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2008-05-07 15:02:17 -0400 |
| commit | 8614f360bdc7db8d35609a9c771601f1d45539e5 (patch) | |
| tree | 9309ba2f774ea22552bafc9f68585ddb3ebce67d /drivers/net/wireless/iwlwifi/iwl-eeprom.c | |
| parent | b661c8190e91c0baeebf813fec7ff8e99e155a54 (diff) | |
| download | blackbird-op-linux-8614f360bdc7db8d35609a9c771601f1d45539e5.tar.gz blackbird-op-linux-8614f360bdc7db8d35609a9c771601f1d45539e5.zip | |
iwlwifi: check eeprom version in pci probe time
This patch move eeprom version checking into pci probe stage
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-eeprom.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-eeprom.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-eeprom.c b/drivers/net/wireless/iwlwifi/iwl-eeprom.c index efd48ca27a8e..8bec0e32f1fc 100644 --- a/drivers/net/wireless/iwlwifi/iwl-eeprom.c +++ b/drivers/net/wireless/iwlwifi/iwl-eeprom.c @@ -279,6 +279,11 @@ void iwl_eeprom_free(struct iwl_priv *priv) } EXPORT_SYMBOL(iwl_eeprom_free); +int iwl_eeprom_check_version(struct iwl_priv *priv) +{ + return priv->cfg->ops->lib->eeprom_ops.check_version(priv); +} +EXPORT_SYMBOL(iwl_eeprom_check_version); const u8 *iwl_eeprom_query_addr(const struct iwl_priv *priv, size_t offset) { @@ -423,12 +428,6 @@ int iwl_init_channel_map(struct iwl_priv *priv) return 0; } - if (iwl_eeprom_query16(priv, EEPROM_VERSION) < 0x2f) { - IWL_WARNING("Unsupported EEPROM version: 0x%04X\n", - iwl_eeprom_query16(priv, EEPROM_VERSION)); - return -EINVAL; - } - IWL_DEBUG_INFO("Initializing regulatory info from EEPROM\n"); priv->channel_count = |
