diff options
| author | Tomas Winkler | 2008-04-24 02:14:55 +0200 |
|---|---|---|
| committer | John W. Linville | 2008-05-07 21:02:17 +0200 |
| commit | 8614f360bdc7db8d35609a9c771601f1d45539e5 (patch) | |
| tree | 9309ba2f774ea22552bafc9f68585ddb3ebce67d /drivers/net/wireless/iwlwifi/iwl4965-base.c | |
| parent | iwlwifi: add iwl_hw_detect function to iwl core (diff) | |
| download | kernel-qcow2-linux-8614f360bdc7db8d35609a9c771601f1d45539e5.tar.gz kernel-qcow2-linux-8614f360bdc7db8d35609a9c771601f1d45539e5.tar.xz kernel-qcow2-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/iwl4965-base.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl4965-base.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl4965-base.c b/drivers/net/wireless/iwlwifi/iwl4965-base.c index 368fc9a9c2b0..c532584b11e6 100644 --- a/drivers/net/wireless/iwlwifi/iwl4965-base.c +++ b/drivers/net/wireless/iwlwifi/iwl4965-base.c @@ -7479,6 +7479,10 @@ static int iwl4965_pci_probe(struct pci_dev *pdev, const struct pci_device_id *e IWL_ERROR("Unable to init EEPROM\n"); goto out_iounmap; } + err = iwl_eeprom_check_version(priv); + if (err) + goto out_iounmap; + /* MAC Address location in EEPROM same for 3945/4965 */ iwl_eeprom_get_mac(priv, priv->mac_addr); IWL_DEBUG_INFO("MAC address: %s\n", print_mac(mac, priv->mac_addr)); |