diff options
Diffstat (limited to 'drivers/net/wireless/iwlwifi')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-3945.c | 4 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-agn.c | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-3945.c b/drivers/net/wireless/iwlwifi/iwl-3945.c index 166e9f742596..f4cd9370e7fa 100644 --- a/drivers/net/wireless/iwlwifi/iwl-3945.c +++ b/drivers/net/wireless/iwlwifi/iwl-3945.c | |||
@@ -898,13 +898,11 @@ static void iwl3945_nic_config(struct iwl_priv *priv) | |||
898 | { | 898 | { |
899 | struct iwl3945_eeprom *eeprom = (struct iwl3945_eeprom *)priv->eeprom; | 899 | struct iwl3945_eeprom *eeprom = (struct iwl3945_eeprom *)priv->eeprom; |
900 | unsigned long flags; | 900 | unsigned long flags; |
901 | u8 rev_id = 0; | 901 | u8 rev_id = priv->pci_dev->revision; |
902 | 902 | ||
903 | spin_lock_irqsave(&priv->lock, flags); | 903 | spin_lock_irqsave(&priv->lock, flags); |
904 | 904 | ||
905 | /* Determine HW type */ | 905 | /* Determine HW type */ |
906 | pci_read_config_byte(priv->pci_dev, PCI_REVISION_ID, &rev_id); | ||
907 | |||
908 | IWL_DEBUG_INFO(priv, "HW Revision ID = 0x%X\n", rev_id); | 906 | IWL_DEBUG_INFO(priv, "HW Revision ID = 0x%X\n", rev_id); |
909 | 907 | ||
910 | if (rev_id & PCI_CFG_REV_ID_BIT_RTP) | 908 | if (rev_id & PCI_CFG_REV_ID_BIT_RTP) |
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c index abd0461bd307..8025c62d4d0c 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn.c | |||
@@ -4056,7 +4056,7 @@ static void iwl_hw_detect(struct iwl_priv *priv) | |||
4056 | { | 4056 | { |
4057 | priv->hw_rev = _iwl_read32(priv, CSR_HW_REV); | 4057 | priv->hw_rev = _iwl_read32(priv, CSR_HW_REV); |
4058 | priv->hw_wa_rev = _iwl_read32(priv, CSR_HW_REV_WA_REG); | 4058 | priv->hw_wa_rev = _iwl_read32(priv, CSR_HW_REV_WA_REG); |
4059 | pci_read_config_byte(priv->pci_dev, PCI_REVISION_ID, &priv->rev_id); | 4059 | priv->rev_id = priv->pci_dev->revision; |
4060 | IWL_DEBUG_INFO(priv, "HW Revision ID = 0x%X\n", priv->rev_id); | 4060 | IWL_DEBUG_INFO(priv, "HW Revision ID = 0x%X\n", priv->rev_id); |
4061 | } | 4061 | } |
4062 | 4062 | ||