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

Commit 562db532 authored by Johannes Berg's avatar Johannes Berg Committed by Reinette Chatre
Browse files

iwlagn: wait for asynchronous firmware loading 



When we kick off a firmware loading process,
and then unbind from the pci device right
away, we get into trouble. Avoid that by
waiting for the firmware loading to finish
(whether successfully or not) before the
unbind in iwl_pci_remove.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarReinette Chatre <reinette.chatre@intel.com>
parent 79733a86

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

+6 −0
Original line number Diff line number Diff line
@@ -1741,6 +1741,7 @@ static void iwl_ucode_callback(const struct firmware *ucode_raw, void *context) 


	/* We have our copies now, allow OS release its copies */

	release_firmware(ucode_raw);

	complete(&priv->firmware_loading_complete);

	return;



 try_again:
@@ -1754,6 +1755,7 @@ static void iwl_ucode_callback(const struct firmware *ucode_raw, void *context) 
	IWL_ERR(priv, "failed to allocate pci memory\n");

	iwl_dealloc_ucode_pci(priv);

 out_unbind:

	complete(&priv->firmware_loading_complete);

	device_release_driver(&priv->pci_dev->dev);

	release_firmware(ucode_raw);

}
@@ -3671,6 +3673,8 @@ static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	iwl_power_initialize(priv);

	iwl_tt_initialize(priv);



	init_completion(&priv->firmware_loading_complete);



	err = iwl_request_firmware(priv, true);

	if (err)

		goto out_remove_sysfs;
@@ -3711,6 +3715,8 @@ static void __devexit iwl_pci_remove(struct pci_dev *pdev) 
	if (!priv)

		return;



	wait_for_completion(&priv->firmware_loading_complete);



	IWL_DEBUG_INFO(priv, "*** UNLOAD DRIVER ***\n");



	iwl_dbgfs_unregister(priv);

drivers/net/wireless/iwlwifi/iwl-dev.h

+2 −0
Original line number Diff line number Diff line
@@ -1304,6 +1304,8 @@ struct iwl_priv { 
	struct delayed_work alive_start;

	struct delayed_work scan_check;



	struct completion firmware_loading_complete;



	/*For 3945 only*/

	struct delayed_work thermal_periodic;

	struct delayed_work rfkill_poll;