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: Wey-Yi Guy <wey-yi.w.guy@intel.com> Signed-off-by: Reinette Chatre <reinette.chatre@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
committed by
John W. Linville
parent
10c435f18b
commit
d7c76f4c50
@@ -3105,8 +3105,8 @@ static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
|
|||||||
out_pci_disable_device:
|
out_pci_disable_device:
|
||||||
pci_disable_device(pdev);
|
pci_disable_device(pdev);
|
||||||
out_ieee80211_free_hw:
|
out_ieee80211_free_hw:
|
||||||
ieee80211_free_hw(priv->hw);
|
|
||||||
iwl_free_traffic_mem(priv);
|
iwl_free_traffic_mem(priv);
|
||||||
|
ieee80211_free_hw(priv->hw);
|
||||||
out:
|
out:
|
||||||
return err;
|
return err;
|
||||||
}
|
}
|
||||||
|
@@ -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_set_drvdata(pdev, NULL);
|
||||||
pci_disable_device(pdev);
|
pci_disable_device(pdev);
|
||||||
out_ieee80211_free_hw:
|
out_ieee80211_free_hw:
|
||||||
ieee80211_free_hw(priv->hw);
|
|
||||||
iwl_free_traffic_mem(priv);
|
iwl_free_traffic_mem(priv);
|
||||||
|
ieee80211_free_hw(priv->hw);
|
||||||
out:
|
out:
|
||||||
return err;
|
return err;
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user