diff options
| author | Don Fry <donald.h.fry@intel.com> | 2012-02-06 16:00:14 -0800 |
|---|---|---|
| committer | Wey-Yi Guy <wey-yi.w.guy@intel.com> | 2012-02-17 10:28:06 -0800 |
| commit | 96502ceb1c122cf5496c9176bb690a52b3fab362 (patch) | |
| tree | eca2439d4a72c7e2ec7330bc50ce9cc6c8fe66d8 /drivers/net/wireless/iwlwifi/iwl-ucode.c | |
| parent | 737805ff7a15105b77d83c7c3b17fa0868cb864e (diff) | |
| download | op-kernel-dev-96502ceb1c122cf5496c9176bb690a52b3fab362.zip op-kernel-dev-96502ceb1c122cf5496c9176bb690a52b3fab362.tar.gz | |
iwlwifi: move firmware_loading_complete to iwl_nic
Move firmware_loading_complete from iwl_priv to iwl_nic and rename it
to more accurately reflect what it does.
Signed-off-by: Don Fry <donald.h.fry@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-ucode.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-ucode.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-ucode.c b/drivers/net/wireless/iwlwifi/iwl-ucode.c index 0ba8ea9..51a8fb3 100644 --- a/drivers/net/wireless/iwlwifi/iwl-ucode.c +++ b/drivers/net/wireless/iwlwifi/iwl-ucode.c @@ -1273,7 +1273,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); + complete(&nic->request_firmware_complete); return; try_again: @@ -1287,7 +1287,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(trans(priv)); out_unbind: - complete(&priv->firmware_loading_complete); + complete(&nic->request_firmware_complete); device_release_driver(trans(priv)->dev); release_firmware(ucode_raw); } |
