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

Commit d7c76f4c authored by Wey-Yi Guy's avatar Wey-Yi Guy Committed by John W. Linville
Browse files

iwlwifi: change the order of freeing memory 



Need to free the dynamic allocated memory before ieee80211_free_hw();
once call ieee80211_free_hw(), should not reference to "priv" data
structure.

Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: default avatarReinette Chatre <reinette.chatre@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 10c435f1

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

+1 −1
Original line number Diff line number Diff line
@@ -3105,8 +3105,8 @@ static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
 out_pci_disable_device:

	pci_disable_device(pdev);

 out_ieee80211_free_hw:

	ieee80211_free_hw(priv->hw);

	iwl_free_traffic_mem(priv);

	ieee80211_free_hw(priv->hw);

 out:

	return err;

}

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

+1 −1
Original line number Diff line number Diff line
@@ -4096,8 +4096,8 @@ static int iwl3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *e 
	pci_set_drvdata(pdev, NULL);

	pci_disable_device(pdev);

 out_ieee80211_free_hw:

	ieee80211_free_hw(priv->hw);

	iwl_free_traffic_mem(priv);

	ieee80211_free_hw(priv->hw);

 out:

	return err;

}