aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2013-04-04 04:35:23 -0400
committerJohannes Berg <johannes.berg@intel.com>2013-04-08 07:30:45 -0400
commit1618b2b02a3a0ee7a6863fed4b0d22e697e7e97c (patch)
tree2ab057a6879ac407f6e021551d358e43a0f60071
parentd37cac98aba4a5c96142eab71785967feb73022f (diff)
iwlwifi: print warning on request_module failure
If request_module() failed then we didn't have the correct opmode module that the driver needs to function, so print a warning in this case to make it more obvious what could be wrong. This still won't catch the case where the module simply doesn't exist because it wasn't compiled though. Reviewed-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-drv.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-drv.c b/drivers/net/wireless/iwlwifi/iwl-drv.c
index b98873c70255..39aad9893e0b 100644
--- a/drivers/net/wireless/iwlwifi/iwl-drv.c
+++ b/drivers/net/wireless/iwlwifi/iwl-drv.c
@@ -998,8 +998,13 @@ static void iwl_req_fw_callback(const struct firmware *ucode_raw, void *context)
998 * else from proceeding if the module fails to load 998 * else from proceeding if the module fails to load
999 * or hangs loading. 999 * or hangs loading.
1000 */ 1000 */
1001 if (load_module) 1001 if (load_module) {
1002 request_module("%s", op->name); 1002 err = request_module("%s", op->name);
1003 if (err)
1004 IWL_ERR(drv,
1005 "failed to load module %s (error %d), is dynamic loading enabled?\n",
1006 op->name, err);
1007 }
1003 return; 1008 return;
1004 1009
1005 try_again: 1010 try_again: