[PATCH] iwlwifi: fix merge damage in iwl_req_fw_callback()

[Luca Coelho]

From: Luca Coelho <luciano.coe...@intel.com>

A merge damage happened when applying commit 06a1e85e66ba ("iwlwifi:
remove module loading failure message") from our internal tree to
iwlwifi-next.git.  Fix it.

Fixes: 06a1e85e66ba ("iwlwifi: remove module loading failure message")
Reported-by: Pavel Roskin <plros...@gmail.com>
Signed-off-by: Luca Coelho <luciano.coe...@intel.com>
---
 drivers/net/wireless/intel/iwlwifi/iwl-drv.c | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-drv.c 
b/drivers/net/wireless/intel/iwlwifi/iwl-drv.c
index 5cfacb0bca84..5087ca3c848d 100644
--- a/drivers/net/wireless/intel/iwlwifi/iwl-drv.c
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-drv.c
@@ -1493,15 +1493,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
-       }
        goto free;
 
  try_again:
-- 
2.11.0