Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8747bb49 authored by Emmanuel Grumbach's avatar Emmanuel Grumbach Committed by Wey-Yi Guy
Browse files

iwlwifi: separate the APM from the EEPROM 



There is no link between the two. Ensure that the NIC is on outside
the code of the EEPROM handling.

Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
parent a5916977

drivers/net/wireless/iwlwifi/iwl-agn.c

+4 −0
Original line number Diff line number Diff line
@@ -1848,8 +1848,12 @@ int iwl_probe(struct iwl_bus *bus, const struct iwl_trans_ops *trans_ops, 
	/*****************

	 * 4. Read EEPROM

	 *****************/

	/* switch the NIC on before accessing the EEPROM */

	iwl_apm_init(priv);

	/* Read the EEPROM */

	err = iwl_eeprom_init(priv, hw_rev);

	/* Reset chip to save power until we load uCode during "up". */

	iwl_apm_stop(priv);

	if (err) {

		IWL_ERR(priv, "Unable to init EEPROM\n");

		goto out_free_trans;

drivers/net/wireless/iwlwifi/iwl-eeprom.c

+0 −4
Original line number Diff line number Diff line
@@ -676,8 +676,6 @@ int iwl_eeprom_init(struct iwl_priv *priv, u32 hw_rev) 
	}

	e = (__le16 *)shrd->eeprom;



	iwl_apm_init(priv);



	ret = iwl_eeprom_verify_signature(trans(priv));

	if (ret < 0) {

		IWL_ERR(priv, "EEPROM not found, EEPROM_GP=0x%08x\n", gp);
@@ -758,8 +756,6 @@ int iwl_eeprom_init(struct iwl_priv *priv, u32 hw_rev) 
err:

	if (ret)

		iwl_eeprom_free(priv->shrd);

	/* Reset chip to save power until we load uCode during "up". */

	iwl_apm_stop(priv);

alloc_err:

	return ret;

}