mwifiex: fix null derefs, mem leaks and trivia

[deliverable/linux.git] / drivers / net / wireless / mwifiex / cfg80211.c

diff --git a/drivers/net/wireless/mwifiex/cfg80211.c b/drivers/net/wireless/mwifiex/cfg80211.c
index 0c0116374d7d7bb94b0c6b2dc006cc2c3c724d0f..19be8870c683b0952f6e085d8a1e91845ff3742a 100644 (file)
--- a/drivers/net/wireless/mwifiex/cfg80211.c
+++ b/drivers/net/wireless/mwifiex/cfg80211.c
@@ -1255,8 +1255,10 @@ int mwifiex_register_cfg80211(struct net_device *dev, u8 *mac,
        wdev->wiphy =
                wiphy_new(&mwifiex_cfg80211_ops,
                          sizeof(struct mwifiex_private *));
-       if (!wdev->wiphy)
+       if (!wdev->wiphy) {
+               kfree(wdev);
                return -ENOMEM;
+       }
        wdev->iftype = NL80211_IFTYPE_STATION;
        wdev->wiphy->max_scan_ssids = 10;
        wdev->wiphy->interface_modes =
@@ -1296,6 +1298,7 @@ int mwifiex_register_cfg80211(struct net_device *dev, u8 *mac,
                dev_err(priv->adapter->dev, "%s: registering cfg80211 device\n",
                                                __func__);
                wiphy_free(wdev->wiphy);
+               kfree(wdev);
                return ret;
        } else {
                dev_dbg(priv->adapter->dev,