1 files changed, 5 insertions, 3 deletions

diff --git a/drivers/net/wireless/ath/ath6kl/cfg80211.c b/drivers/net/wireless/ath/ath6kl/cfg80211.c
index df95e0d9d708..dd07ae560785 100644
--- a/drivers/net/wireless/ath/ath6kl/cfg80211.c
+++ b/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);