iwlwifi: remove module loading failure message
authorJohannes Berg <johannes.berg@intel.com>
Fri, 10 Dec 2021 09:12:45 +0000 (11:12 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 27 Jan 2022 10:04:47 +0000 (11:04 +0100)
[ 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

index 2206f66..b7f7b9c 100644 (file)
@@ -1597,15 +1597,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;