Commit 8edf3fd6 authored by Johannes Berg's avatar Johannes Berg

iwlwifi: don't print module loading error if not modular

If the opmode modules aren't modular, there's no point in
printing an error message that request_module() failed.
This will happen because the probe runs during iwlwifi's
init and the opmode is only added during its init.
Reported-by: default avatarJörg Otte <jrg.otte@gmail.com>
Reviewed-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent a8778369
...@@ -1000,10 +1000,12 @@ static void iwl_req_fw_callback(const struct firmware *ucode_raw, void *context) ...@@ -1000,10 +1000,12 @@ static void iwl_req_fw_callback(const struct firmware *ucode_raw, void *context)
*/ */
if (load_module) { if (load_module) {
err = request_module("%s", op->name); err = request_module("%s", op->name);
#ifdef CONFIG_IWLWIFI_OPMODE_MODULAR
if (err) if (err)
IWL_ERR(drv, IWL_ERR(drv,
"failed to load module %s (error %d), is dynamic loading enabled?\n", "failed to load module %s (error %d), is dynamic loading enabled?\n",
op->name, err); op->name, err);
#endif
} }
return; return;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment