iwlwifi: delay firmware loading from pci_probe to network interface open

[linux-2.6-omap-h63xx.git] / drivers / net / wireless / iwlwifi / iwl-3945.c

diff --git a/drivers/net/wireless/iwlwifi/iwl-3945.c b/drivers/net/wireless/iwlwifi/iwl-3945.c
index 77e7202c026b780359e8827a2d30894be29264a1..0779a23729e54f519b207c6f397ebea1d6c7293e 100644 (file)
--- a/drivers/net/wireless/iwlwifi/iwl-3945.c
+++ b/drivers/net/wireless/iwlwifi/iwl-3945.c
@@ -1004,14 +1004,6 @@ int iwl3945_hw_nic_init(struct iwl3945_priv *priv)
                            CSR_HW_IF_CONFIG_REG_BIT_ALMAGOR_MM);
        }
 
-       spin_unlock_irqrestore(&priv->lock, flags);
-
-       /* Initialize the EEPROM */
-       rc = iwl3945_eeprom_init(priv);
-       if (rc)
-               return rc;
-
-       spin_lock_irqsave(&priv->lock, flags);
        if (EEPROM_SKU_CAP_OP_MODE_MRC == priv->eeprom.sku_cap) {
                IWL_DEBUG_INFO("SKU OP mode is mrc\n");
                iwl3945_set_bit(priv, CSR_HW_IF_CONFIG_REG,