3 files changed, 20 insertions, 12 deletions

diff --git a/drivers/net/wireless/libertas/cfg.c b/drivers/net/wireless/libertas/cfg.c
index ff6378276ff0..4fcd653bddc4 100644
--- a/drivers/net/wireless/libertas/cfg.c
+++ b/drivers/net/wireless/libertas/cfg.c
@@ -728,15 +728,9 @@ static void lbs_scan_worker(struct work_struct *work)
                 le16_to_cpu(scan_cmd->hdr.size),
                 lbs_ret_scan, 0);
 
-        if (priv->scan_channel >= priv->scan_req->n_channels) {
+        if (priv->scan_channel >= priv->scan_req->n_channels)
                 /* Mark scan done */
-                if (priv->internal_scan)
-                        kfree(priv->scan_req);
-                else
-                        cfg80211_scan_done(priv->scan_req, false);
-
-                priv->scan_req = NULL;
-        }
+                lbs_scan_done(priv);
 
         /* Restart network */
         if (carrier)
@@ -774,6 +768,21 @@ static void _internal_start_scan(struct lbs_private *priv, bool internal,
         lbs_deb_leave(LBS_DEB_CFG80211);
 }
 
+/*
+ * Clean up priv->scan_req.  Should be used to handle the allocation details.
+ */
+void lbs_scan_done(struct lbs_private *priv)
+{
+        WARN_ON(!priv->scan_req);
+
+        if (priv->internal_scan)
+                kfree(priv->scan_req);
+        else
+                cfg80211_scan_done(priv->scan_req, false);
+
+        priv->scan_req = NULL;
+}
+
 static int lbs_cfg_scan(struct wiphy *wiphy,
         struct net_device *dev,
         struct cfg80211_scan_request *request)
diff --git a/drivers/net/wireless/libertas/cfg.h b/drivers/net/wireless/libertas/cfg.h
index a02ee151710e..558168ce634d 100644
--- a/drivers/net/wireless/libertas/cfg.h
+++ b/drivers/net/wireless/libertas/cfg.h
@@ -16,6 +16,7 @@ int lbs_reg_notifier(struct wiphy *wiphy,
 void lbs_send_disconnect_notification(struct lbs_private *priv);
 void lbs_send_mic_failureevent(struct lbs_private *priv, u32 event);
 
+void lbs_scan_done(struct lbs_private *priv);
 void lbs_scan_deinit(struct lbs_private *priv);
 int lbs_disconnect(struct lbs_private *priv, u16 reason);
 
diff --git a/drivers/net/wireless/libertas/main.c b/drivers/net/wireless/libertas/main.c
index b03779bcd547..39a6a7a40244 100644
--- a/drivers/net/wireless/libertas/main.c
+++ b/drivers/net/wireless/libertas/main.c
@@ -255,10 +255,8 @@ static int lbs_eth_stop(struct net_device *dev)
 
         lbs_update_mcast(priv);
         cancel_delayed_work_sync(&priv->scan_work);
-        if (priv->scan_req) {
-                cfg80211_scan_done(priv->scan_req, false);
-                priv->scan_req = NULL;
-        }
+        if (priv->scan_req)
+                lbs_scan_done(priv);
 
         netif_carrier_off(priv->dev);