From b3d2c428ce7b2a1780223323217023ef903230ec Mon Sep 17 00:00:00 2001 From: Don Fry Date: Mon, 6 Feb 2012 16:00:14 -0800 Subject: [PATCH] --- yaml --- r: 290665 b: refs/heads/master c: 96502ceb1c122cf5496c9176bb690a52b3fab362 h: refs/heads/master i: 290663: eba010dbf022e943fd0b0e08344704c53cbe7c0f v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/iwlwifi/iwl-agn.c | 4 ++-- trunk/drivers/net/wireless/iwlwifi/iwl-dev.h | 2 -- trunk/drivers/net/wireless/iwlwifi/iwl-ucode.c | 4 ++-- 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 310444453b98..3b9e369d02a6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 737805ff7a15105b77d83c7c3b17fa0868cb864e +refs/heads/master: 96502ceb1c122cf5496c9176bb690a52b3fab362 diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-agn.c b/trunk/drivers/net/wireless/iwlwifi/iwl-agn.c index 9e902f7e9d35..12803d3fb2f9 100644 --- a/trunk/drivers/net/wireless/iwlwifi/iwl-agn.c +++ b/trunk/drivers/net/wireless/iwlwifi/iwl-agn.c @@ -1273,7 +1273,7 @@ int iwl_probe(struct iwl_bus *bus, const struct iwl_trans_ops *trans_ops, iwl_power_initialize(priv); iwl_tt_initialize(priv); - init_completion(&priv->firmware_loading_complete); + init_completion(&nic(priv)->request_firmware_complete); err = iwl_request_firmware(priv, true); if (err) @@ -1296,7 +1296,7 @@ int iwl_probe(struct iwl_bus *bus, const struct iwl_trans_ops *trans_ops, void __devexit iwl_remove(struct iwl_priv * priv) { - wait_for_completion(&priv->firmware_loading_complete); + wait_for_completion(&nic(priv)->request_firmware_complete); IWL_DEBUG_INFO(priv, "*** UNLOAD DRIVER ***\n"); diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-dev.h b/trunk/drivers/net/wireless/iwlwifi/iwl-dev.h index 332101006353..0d0b4bb9dc63 100644 --- a/trunk/drivers/net/wireless/iwlwifi/iwl-dev.h +++ b/trunk/drivers/net/wireless/iwlwifi/iwl-dev.h @@ -864,8 +864,6 @@ struct iwl_priv { struct iwl_rx_phy_res last_phy_res; bool last_phy_res_valid; - struct completion firmware_loading_complete; - u32 init_evtlog_ptr, init_evtlog_size, init_errlog_ptr; u32 inst_evtlog_ptr, inst_evtlog_size, inst_errlog_ptr; diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-ucode.c b/trunk/drivers/net/wireless/iwlwifi/iwl-ucode.c index 0ba8ea910274..51a8fb353a6e 100644 --- a/trunk/drivers/net/wireless/iwlwifi/iwl-ucode.c +++ b/trunk/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); }