Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into merge

Conflicts:
	Documentation/feature-removal-schedule.txt
	drivers/net/wireless/ath/ath5k/phy.c
	drivers/net/wireless/iwlwifi/iwl-4965.c
	drivers/net/wireless/iwlwifi/iwl-agn.c
	drivers/net/wireless/iwlwifi/iwl-core.c
	drivers/net/wireless/iwlwifi/iwl-core.h
	drivers/net/wireless/iwlwifi/iwl-tx.c

2 files changed, 7 insertions, 2 deletions

diff --git a/drivers/net/wireless/libertas/cfg.c b/drivers/net/wireless/libertas/cfg.c
index 4396dccd12ac..82ebe1461a77 100644
--- a/drivers/net/wireless/libertas/cfg.c
+++ b/drivers/net/wireless/libertas/cfg.c
@@ -172,6 +172,8 @@ int lbs_cfg_register(struct lbs_private *priv)
         if (ret < 0)
                 lbs_pr_err("cannot register wiphy device\n");
 
+        priv->wiphy_registered = true;
+
         ret = register_netdev(priv->dev);
         if (ret)
                 lbs_pr_err("cannot register network device\n");
@@ -190,9 +192,11 @@ void lbs_cfg_free(struct lbs_private *priv)
         if (!wdev)
                 return;
 
-        if (wdev->wiphy) {
+        if (priv->wiphy_registered)
                 wiphy_unregister(wdev->wiphy);
+
+        if (wdev->wiphy)
                 wiphy_free(wdev->wiphy);
-        }
+
         kfree(wdev);
 }
diff --git a/drivers/net/wireless/libertas/dev.h b/drivers/net/wireless/libertas/dev.h
index 058d1720242e..a54880e4ad2b 100644
--- a/drivers/net/wireless/libertas/dev.h
+++ b/drivers/net/wireless/libertas/dev.h
@@ -36,6 +36,7 @@ struct lbs_private {
 
         /* CFG80211 */
         struct wireless_dev *wdev;
+        bool wiphy_registered;
 
         /* Mesh */
         struct net_device *mesh_dev; /* Virtual device */