2 files changed, 8 insertions, 2 deletions

diff --git a/drivers/net/wireless/ath/ath6kl/htc_mbox.c b/drivers/net/wireless/ath/ath6kl/htc_mbox.c
index 89eccadd5386..2798624d3a9d 100644
--- a/drivers/net/wireless/ath/ath6kl/htc_mbox.c
+++ b/drivers/net/wireless/ath/ath6kl/htc_mbox.c
@@ -854,6 +854,7 @@ static void ath6kl_htc_tx_from_queue(struct htc_target *target,
         int bundle_sent;
         int n_pkts_bundle;
         u8 ac = WMM_NUM_AC;
+        int status;
 
         spin_lock_bh(&target->tx_lock);
 
@@ -915,7 +916,12 @@ static void ath6kl_htc_tx_from_queue(struct htc_target *target,
 
                         ath6kl_htc_tx_prep_pkt(packet, packet->info.tx.flags,
                                                0, packet->info.tx.seqno);
-                        ath6kl_htc_tx_issue(target, packet);
+                        status = ath6kl_htc_tx_issue(target, packet);
+
+                        if (status) {
+                                packet->status = status;
+                                packet->completion(packet->context, packet);
+                        }
                 }
 
                 spin_lock_bh(&target->tx_lock);
diff --git a/drivers/net/wireless/ath/ath6kl/sdio.c b/drivers/net/wireless/ath/ath6kl/sdio.c
index 0384a0fb654f..05b95405f7b5 100644
--- a/drivers/net/wireless/ath/ath6kl/sdio.c
+++ b/drivers/net/wireless/ath/ath6kl/sdio.c
@@ -552,7 +552,7 @@ static int ath6kl_sdio_write_async(struct ath6kl *ar, u32 address, u8 *buffer,
 
         bus_req = ath6kl_sdio_alloc_busreq(ar_sdio);
 
-        if (!bus_req)
+        if (WARN_ON_ONCE(!bus_req))
                 return -ENOMEM;
 
         bus_req->address = address;