Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...

[pandora-kernel.git] / drivers / net / wireless / iwlegacy / iwl-3945.c

diff --git a/drivers/net/wireless/iwlegacy/iwl-3945.c b/drivers/net/wireless/iwlegacy/iwl-3945.c
index 8359594..d096dc2 100644 (file)
--- a/drivers/net/wireless/iwlegacy/iwl-3945.c
+++ b/drivers/net/wireless/iwlegacy/iwl-3945.c
@@ -897,13 +897,11 @@ static void iwl3945_nic_config(struct iwl_priv *priv)
 {
        struct iwl3945_eeprom *eeprom = (struct iwl3945_eeprom *)priv->eeprom;
        unsigned long flags;
-       u8 rev_id = 0;
+       u8 rev_id = priv->pci_dev->revision;
 
        spin_lock_irqsave(&priv->lock, flags);
 
        /* Determine HW type */
-       pci_read_config_byte(priv->pci_dev, PCI_REVISION_ID, &rev_id);
-
        IWL_DEBUG_INFO(priv, "HW Revision ID = 0x%X\n", rev_id);
 
        if (rev_id & PCI_CFG_REV_ID_BIT_RTP)