summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2013-05-28 21:32:47 +0200
committerJohannes Berg <johannes.berg@intel.com>2013-06-04 13:12:07 +0200
commit8edf3fd6eb0649b0f19363baf23bca39c6fbdba4 (patch)
treefc54b2e15e868fe317ae2a0a0b7c1b712c6ebf06 /drivers
parentiwlwifi: dvm: fix zero LQ CMD sending avoidance (diff)
downloadlinux-8edf3fd6eb0649b0f19363baf23bca39c6fbdba4.tar.xz
linux-8edf3fd6eb0649b0f19363baf23bca39c6fbdba4.zip
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: Jörg Otte <jrg.otte@gmail.com> Reviewed-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-drv.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-drv.c b/drivers/net/wireless/iwlwifi/iwl-drv.c
index 39aad9893e0b..40fed1f511e2 100644
--- a/drivers/net/wireless/iwlwifi/iwl-drv.c
+++ b/drivers/net/wireless/iwlwifi/iwl-drv.c
@@ -1000,10 +1000,12 @@ static void iwl_req_fw_callback(const struct firmware *ucode_raw, void *context)
*/
if (load_module) {
err = 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
}
return;