From 96502ceb1c122cf5496c9176bb690a52b3fab362 Mon Sep 17 00:00:00 2001 From: Don Fry Date: Mon, 6 Feb 2012 16:00:14 -0800 Subject: 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 Signed-off-by: Wey-Yi Guy --- drivers/net/wireless/iwlwifi/iwl-ucode.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'drivers/net/wireless/iwlwifi/iwl-ucode.c') diff --git a/drivers/net/wireless/iwlwifi/iwl-ucode.c b/drivers/net/wireless/iwlwifi/iwl-ucode.c index 0ba8ea910274..51a8fb353a6e 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); } -- cgit v1.2.2