2 files changed, 7 insertions, 1 deletions

diff --git a/drivers/net/wireless/iwlwifi/mvm/scan.c b/drivers/net/wireless/iwlwifi/mvm/scan.c
index c91dc8498852..9e760d0c5985 100644
--- a/drivers/net/wireless/iwlwifi/mvm/scan.c
+++ b/drivers/net/wireless/iwlwifi/mvm/scan.c
@@ -348,7 +348,10 @@ int iwl_mvm_scan_request(struct iwl_mvm *mvm,
         struct iwl_mvm_scan_params params = {};
 
         lockdep_assert_held(&mvm->mutex);
-        BUG_ON(mvm->scan_cmd == NULL);
+
+        /* we should have failed registration if scan_cmd was NULL */
+        if (WARN_ON(mvm->scan_cmd == NULL))
+                return -ENOMEM;
 
         IWL_DEBUG_SCAN(mvm, "Handling mac80211 scan request\n");
         mvm->scan_status = IWL_MVM_SCAN_OS;
diff --git a/drivers/net/wireless/iwlwifi/pcie/trans.c b/drivers/net/wireless/iwlwifi/pcie/trans.c
index 4845d5019c4b..f98ef1e62eb9 100644
--- a/drivers/net/wireless/iwlwifi/pcie/trans.c
+++ b/drivers/net/wireless/iwlwifi/pcie/trans.c
@@ -1278,6 +1278,8 @@ static int iwl_trans_pcie_wait_txq_empty(struct iwl_trans *trans, u32 txq_bm)
                         continue;
                 if (!(BIT(cnt) & txq_bm))
                         continue;
+
+                IWL_DEBUG_TX_QUEUES(trans, "Emptying queue %d...\n", cnt);
                 txq = &trans_pcie->txq[cnt];
                 q = &txq->q;
                 wr_ptr = ACCESS_ONCE(q->write_ptr);
@@ -1300,6 +1302,7 @@ static int iwl_trans_pcie_wait_txq_empty(struct iwl_trans *trans, u32 txq_bm)
                         ret = -ETIMEDOUT;
                         break;
                 }
+                IWL_DEBUG_TX_QUEUES(trans, "Queue %d is now empty.\n", cnt);
         }
 
         if (!ret)