From f57698c7b5857f3fdd6214742e53a21358931338 Mon Sep 17 00:00:00 2001
From: Ben Cahill <ben.m.cahill@intel.com>
Date: Fri, 30 Oct 2009 14:36:06 -0700
Subject: [PATCH] --- yaml --- r: 171359 b: refs/heads/master c:
 88521364cc04b67f36748983545b9fe1d4ba4a15 h: refs/heads/master i:   171357:
 21356ede65ca4e4e6b81cd891584bc3102bbdb62   171355:
 7777b060b3450eb614d576929ade5fc2a0343376   171351:
 364d945d4af40b0a5dc6dad2ddd8e642cc4b18e8   171343:
 d6f226bf00640f57002629bff249f20793537a63   171327:
 f0bd9d3067d4cf4c49bbdd0db76b9dc22719febe v: v3

---
 [refs]                                            |  2 +-
 trunk/drivers/net/wireless/iwlwifi/iwl-agn.c      |  6 ------
 trunk/drivers/net/wireless/iwlwifi/iwl-eeprom.c   | 11 +++++++++++
 trunk/drivers/net/wireless/iwlwifi/iwl3945-base.c |  7 -------
 4 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/[refs] b/[refs]
index e03ed6556897..9b2a24894bb0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5220af0c3b44f5d6e32661e5bb49154c514dbf4f
+refs/heads/master: 88521364cc04b67f36748983545b9fe1d4ba4a15
diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-agn.c b/trunk/drivers/net/wireless/iwlwifi/iwl-agn.c
index 05d1070e22d0..6daaad1e4bc9 100644
--- a/trunk/drivers/net/wireless/iwlwifi/iwl-agn.c
+++ b/trunk/drivers/net/wireless/iwlwifi/iwl-agn.c
@@ -3113,12 +3113,6 @@ static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 		goto out_iounmap;
 	}
 
-	/* amp init */
-	err = priv->cfg->ops->lib->apm_ops.init(priv);
-	if (err < 0) {
-		IWL_ERR(priv, "Failed to init APMG\n");
-		goto out_iounmap;
-	}
 	/*****************
 	 * 4. Read EEPROM
 	 *****************/
diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-eeprom.c b/trunk/drivers/net/wireless/iwlwifi/iwl-eeprom.c
index 9429cb1c69bd..8a0709e81a9f 100644
--- a/trunk/drivers/net/wireless/iwlwifi/iwl-eeprom.c
+++ b/trunk/drivers/net/wireless/iwlwifi/iwl-eeprom.c
@@ -533,6 +533,10 @@ int iwl_eeprom_init(struct iwl_priv *priv)
 		goto err;
 	}
 	if (priv->nvm_device_type == NVM_DEVICE_TYPE_OTP) {
+
+		/* OTP reads require powered-up chip */
+		priv->cfg->ops->lib->apm_ops.init(priv);
+
 		ret = iwl_init_otp_access(priv);
 		if (ret) {
 			IWL_ERR(priv, "Failed to initialize OTP access.\n");
@@ -563,6 +567,13 @@ int iwl_eeprom_init(struct iwl_priv *priv)
 			e[cache_addr / 2] = eeprom_data;
 			cache_addr += sizeof(u16);
 		}
+
+		/*
+		 * Now that OTP reads are complete, reset chip to save
+		 *   power until we load uCode during "up".
+		 */
+		priv->cfg->ops->lib->apm_ops.stop(priv);
+
 	} else {
 		/* eeprom is an array of 16bit values */
 		for (addr = 0; addr < sz; addr += sizeof(u16)) {
diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl3945-base.c b/trunk/drivers/net/wireless/iwlwifi/iwl3945-base.c
index 5c80a83eb2e1..23b31e6dcacd 100644
--- a/trunk/drivers/net/wireless/iwlwifi/iwl3945-base.c
+++ b/trunk/drivers/net/wireless/iwlwifi/iwl3945-base.c
@@ -4000,13 +4000,6 @@ static int iwl3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *e
 	 */
 	spin_lock_init(&priv->reg_lock);
 
-	/* amp init */
-	err = priv->cfg->ops->lib->apm_ops.init(priv);
-	if (err < 0) {
-		IWL_DEBUG_INFO(priv, "Failed to init the card\n");
-		goto out_iounmap;
-	}
-
 	/***********************
 	 * 4. Read EEPROM
 	 * ********************/