From 1d535c61dd3ea86ebeb3c1b2c64975ceed7b9362 Mon Sep 17 00:00:00 2001
From: Raja Mani <rmani@qca.qualcomm.com>
Date: Wed, 28 Mar 2012 18:50:35 +0530
Subject: [PATCH] --- yaml --- r: 300833 b: refs/heads/master c:
 5b35dff0bbdcddb537d4c83097b39343a8f9300f h: refs/heads/master i:   300831:
 939ce486147dd96d1609590d823b0bcd8986bbbc v: v3

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

diff --git a/[refs] b/[refs]
index 38269160d2c6..76b8814d54da 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9cbee358687edf0359e29ac683ec25835134f059
+refs/heads/master: 5b35dff0bbdcddb537d4c83097b39343a8f9300f
diff --git a/trunk/drivers/net/wireless/ath/ath6kl/cfg80211.c b/trunk/drivers/net/wireless/ath/ath6kl/cfg80211.c
index df95e0d9d708..dd07ae560785 100644
--- a/trunk/drivers/net/wireless/ath/ath6kl/cfg80211.c
+++ b/trunk/drivers/net/wireless/ath/ath6kl/cfg80211.c
@@ -941,6 +941,8 @@ static int ath6kl_cfg80211_scan(struct wiphy *wiphy, struct net_device *ndev,
 	if (test_bit(CONNECTED, &vif->flags))
 		force_fg_scan = 1;
 
+	vif->scan_req = request;
+
 	if (test_bit(ATH6KL_FW_CAPABILITY_STA_P2PDEV_DUPLEX,
 		     ar->fw_capabilities)) {
 		/*
@@ -963,10 +965,10 @@ static int ath6kl_cfg80211_scan(struct wiphy *wiphy, struct net_device *ndev,
 						ATH6KL_FG_SCAN_INTERVAL,
 						n_channels, channels);
 	}
-	if (ret)
+	if (ret) {
 		ath6kl_err("wmi_startscan_cmd failed\n");
-	else
-		vif->scan_req = request;
+		vif->scan_req = NULL;
+	}
 
 	kfree(channels);