From d0bcb58c96b695e428f3b57ff61cb974572cb7aa Mon Sep 17 00:00:00 2001
From: Vasanthakumar Thiagarajan <vthiagar@qca.qualcomm.com>
Date: Mon, 18 Jul 2011 14:23:25 +0530
Subject: [PATCH] --- yaml --- r: 265459 b: refs/heads/master c:
 23b7840a1b1327fbcc2599e33f50b26d263d5328 h: refs/heads/master i:   265457:
 27cefd5c3b88bcdb1d2cc276332993bb0f0756de   265455:
 5b4f6463b9a2be52d015f7a147778784dc97f00a v: v3

---
 [refs]                                          | 2 +-
 trunk/drivers/net/wireless/ath/ath6kl/htc_hif.c | 7 ++-----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index ba19dad0d796..2222eef850af 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ca06cadb732955fae377b435c83e3746123a71ac
+refs/heads/master: 23b7840a1b1327fbcc2599e33f50b26d263d5328
diff --git a/trunk/drivers/net/wireless/ath/ath6kl/htc_hif.c b/trunk/drivers/net/wireless/ath/ath6kl/htc_hif.c
index 003fe0abb352..043f85fc6dbb 100644
--- a/trunk/drivers/net/wireless/ath/ath6kl/htc_hif.c
+++ b/trunk/drivers/net/wireless/ath/ath6kl/htc_hif.c
@@ -191,16 +191,13 @@ int ath6kldev_submit_scat_req(struct ath6kl_device *dev,
 		   scat_req->addr, !read ? "async" : "sync",
 		   (read) ? "rd" : "wr");
 
-	if (!read && scat_req->virt_scat)
+	if (!read && scat_req->virt_scat) {
 		status = ath6kldev_cp_scat_dma_buf(scat_req, false);
-
-	if (status) {
-		if (!read) {
+		if (status) {
 			scat_req->status = status;
 			scat_req->complete(dev->ar->htc_target, scat_req);
 			return 0;
 		}
-		return status;
 	}
 
 	status = ath6kl_hif_scat_req_rw(dev->ar, scat_req);