Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 95017cf0 authored by Johannes Berg's avatar Johannes Berg Committed by Greg Kroah-Hartman
Browse files

iwlwifi: remove module loading failure message 



[ 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: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
Link: https://lore.kernel.org/r/20211210091245.289008-2-luca@coelho.fi


Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 0446cafa

drivers/net/wireless/intel/iwlwifi/iwl-drv.c

+1 −8
Original line number Diff line number Diff line
@@ -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;