From ed7fede9b3cf3526e2d2c79105666d4f88bc1f24 Mon Sep 17 00:00:00 2001 From: Vasanthakumar Thiagarajan Date: Thu, 26 Apr 2012 20:26:14 +0530 Subject: [PATCH] --- yaml --- r: 306741 b: refs/heads/master c: 93b42cae16d7af185ebdee0f4e85feccfd40d986 h: refs/heads/master i: 306739: 86e748abd5f1809ce1da144c57cb43fd41e3bcd1 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/ath/ath6kl/htc_mbox.c | 8 +++++++- trunk/drivers/net/wireless/ath/ath6kl/sdio.c | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index b85895cd003b..1bc38781462d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1881ced5963520154aebb616ad7b2ff9c2c7f012 +refs/heads/master: 93b42cae16d7af185ebdee0f4e85feccfd40d986 diff --git a/trunk/drivers/net/wireless/ath/ath6kl/htc_mbox.c b/trunk/drivers/net/wireless/ath/ath6kl/htc_mbox.c index 89eccadd5386..2798624d3a9d 100644 --- a/trunk/drivers/net/wireless/ath/ath6kl/htc_mbox.c +++ b/trunk/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/trunk/drivers/net/wireless/ath/ath6kl/sdio.c b/trunk/drivers/net/wireless/ath/ath6kl/sdio.c index 0384a0fb654f..05b95405f7b5 100644 --- a/trunk/drivers/net/wireless/ath/ath6kl/sdio.c +++ b/trunk/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;