Merge branch 'wireless-2.6' into wireless-next-2.6

[safe/jmp/linux-2.6] / drivers / net / wireless / iwlwifi / iwl-agn.c

diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c
index d18c612..dc28376 100644 (file)
--- a/drivers/net/wireless/iwlwifi/iwl-agn.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn.c
@@ -1776,6 +1776,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->_agn.firmware_loading_complete);
        return;
 
  try_again:
@@ -1789,6 +1790,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->_agn.firmware_loading_complete);
        device_release_driver(&priv->pci_dev->dev);
        release_firmware(ucode_raw);
 }
@@ -3586,6 +3588,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->_agn.firmware_loading_complete);
+
        err = iwl_request_firmware(priv, true);
        if (err)
                goto out_remove_sysfs;
@@ -3626,6 +3630,8 @@ static void __devexit iwl_pci_remove(struct pci_dev *pdev)
        if (!priv)
                return;
 
+       wait_for_completion(&priv->_agn.firmware_loading_complete);
+
        IWL_DEBUG_INFO(priv, "*** UNLOAD DRIVER ***\n");
 
        iwl_dbgfs_unregister(priv);