1 files changed, 9 insertions, 1 deletions

diff --git a/drivers/net/wireless/iwlwifi/iwl-drv.c b/drivers/net/wireless/iwlwifi/iwl-drv.c
index 67c9668d2e37..80898bb808b5 100644
--- a/drivers/net/wireless/iwlwifi/iwl-drv.c
+++ b/drivers/net/wireless/iwlwifi/iwl-drv.c
@@ -899,7 +899,6 @@ static void iwl_ucode_callback(const struct firmware *ucode_raw, void *context)
 
         /* We have our copies now, allow OS release its copies */
         release_firmware(ucode_raw);
-        complete(&drv->request_firmware_complete);
 
         mutex_lock(&iwlwifi_opmode_table_mtx);
         op = &iwlwifi_opmode_table[DVM_OP_MODE];
@@ -910,11 +909,20 @@ static void iwl_ucode_callback(const struct firmware *ucode_raw, void *context)
         if (op->ops) {
                 const struct iwl_op_mode_ops *ops = op->ops;
                 drv->op_mode = ops->start(drv->trans, drv->cfg, &drv->fw);
+
+                if (!drv->op_mode)
+                        goto out_unbind;
         } else {
                 request_module_nowait("%s", op->name);
         }
         mutex_unlock(&iwlwifi_opmode_table_mtx);
 
+        /*
+         * Complete the firmware request last so that
+         * a driver unbind (stop) doesn't run while we
+         * are doing the start() above.
+         */
+        complete(&drv->request_firmware_complete);
         return;
 
  try_again: