Commit 731a29b7 authored by Reinette Chatre's avatar Reinette Chatre Committed by John W. Linville
Browse files

iwlwifi: initialize spinlock before use 



Recent powersaving work resulted in power management ops being called
during EEPROM initialization. The lock used by these functions is not
initialized at this time. Ensure lock is initialized before it is used.

Signed-off-by: default avatarReinette Chatre <reinette.chatre@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent bc45a670

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

+2 −2
Original line number Diff line number Diff line
@@ -3173,7 +3173,6 @@ static int iwl_init_drv(struct iwl_priv *priv) 


	priv->ibss_beacon = NULL;



	spin_lock_init(&priv->lock);

	spin_lock_init(&priv->sta_lock);

	spin_lock_init(&priv->hcmd_lock);
@@ -3361,10 +3360,11 @@ static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
		(unsigned long long) pci_resource_len(pdev, 0));

	IWL_DEBUG_INFO(priv, "pci_resource_base = %p\n", priv->hw_base);



	/* this spin lock will be used in apm_ops.init and EEPROM access

	/* these spin locks will be used in apm_ops.init and EEPROM access

	 * we should init now

	 */

	spin_lock_init(&priv->reg_lock);

	spin_lock_init(&priv->lock);

	iwl_hw_detect(priv);

	IWL_INFO(priv, "Detected Intel Wireless WiFi Link %s REV=0x%X\n",

		priv->cfg->name, priv->hw_rev);

drivers/net/wireless/iwlwifi/iwl3945-base.c

+2 −2
Original line number Diff line number Diff line
@@ -3863,7 +3863,6 @@ static int iwl3945_init_drv(struct iwl_priv *priv) 
	priv->retry_rate = 1;

	priv->ibss_beacon = NULL;



	spin_lock_init(&priv->lock);

	spin_lock_init(&priv->sta_lock);

	spin_lock_init(&priv->hcmd_lock);
@@ -4055,10 +4054,11 @@ static int iwl3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *e 
	 * PCI Tx retries from interfering with C3 CPU state */

	pci_write_config_byte(pdev, 0x41, 0x00);



	/* this spin lock will be used in apm_ops.init and EEPROM access

	/* these spin locks will be used in apm_ops.init and EEPROM access

	 * we should init now

	 */

	spin_lock_init(&priv->reg_lock);

	spin_lock_init(&priv->lock);



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

	 * 4. Read EEPROM

CRA Git | Maintained and supported by SUSTech CRA and CCSE