| From ff99f1bc4aec7e6f9c107c540ccddb5807de106c Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Fri, 10 Dec 2021 11:12:45 +0200 |
| Subject: iwlwifi: remove module loading failure message |
| |
| From: Johannes Berg <johannes.berg@intel.com> |
| |
| [ Upstream commit 6518f83ffa51131daaf439b66094f684da3fb0ae ] |
| |
| When CONFIG_DEBUG_TEST_DRIVER_REMOVE is set, iwlwifi crashes |
| when the opmode module cannot be loaded, due to completing |
| the completion before using drv->dev, which can then already |
| be freed. |
| |
| Fix this by removing the (fairly useless) message. Moving the |
| completion later causes a deadlock instead, so that's not an |
| option. |
| |
| Signed-off-by: Johannes Berg <johannes.berg@intel.com> |
| Signed-off-by: Luca Coelho <luciano.coelho@intel.com> |
| Link: https://lore.kernel.org/r/20211210091245.289008-2-luca@coelho.fi |
| Signed-off-by: Luca Coelho <luciano.coelho@intel.com> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/net/wireless/intel/iwlwifi/iwl-drv.c | 9 +-------- |
| 1 file changed, 1 insertion(+), 8 deletions(-) |
| |
| diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-drv.c b/drivers/net/wireless/intel/iwlwifi/iwl-drv.c |
| index c1a2fb154fe91..83cb2ad03451b 100644 |
| --- a/drivers/net/wireless/intel/iwlwifi/iwl-drv.c |
| +++ b/drivers/net/wireless/intel/iwlwifi/iwl-drv.c |
| @@ -1599,15 +1599,8 @@ static void iwl_req_fw_callback(const struct firmware *ucode_raw, void *context) |
| * else from proceeding if the module fails to load |
| * or hangs loading. |
| */ |
| - if (load_module) { |
| + if (load_module) |
| request_module("%s", op->name); |
| -#ifdef CONFIG_IWLWIFI_OPMODE_MODULAR |
| - if (err) |
| - IWL_ERR(drv, |
| - "failed to load module %s (error %d), is dynamic loading enabled?\n", |
| - op->name, err); |
| -#endif |
| - } |
| failure = false; |
| goto free; |
| |
| -- |
| 2.34.1 |
| |
