From a86b9b82052b6771e235e8ac2baef9df2fee5d24 Mon Sep 17 00:00:00 2001
From: Arend van Spriel <arend@broadcom.com>
Date: Mon, 27 May 2013 21:09:56 +0200
Subject: [PATCH] --- yaml --- r: 376663 b: refs/heads/master c:
 9390ace916b2fd866c1762b1cd16c276d8c8c890 h: refs/heads/master i:   376661:
 750c2a0dac3492bd467119de4584940e44a037e6   376659:
 b7a3602f2484d3c2f3a9791715e997d27cf05621   376655:
 559d041232fa97a0ee8279fc7ab87150f0f58a0f v: v3

---
 [refs]                                                 |  2 +-
 .../net/wireless/brcm80211/brcmfmac/dhd_linux.c        | 10 +++++++---
 trunk/drivers/net/wireless/brcm80211/brcmfmac/fweh.c   |  3 ++-
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 00303b64eaaa..715677f415d5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 24e28beef939df8666a5d2784d6617cd9bb910a0
+refs/heads/master: 9390ace916b2fd866c1762b1cd16c276d8c8c890
diff --git a/trunk/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c b/trunk/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c
index 59c25463e428..f04e3555dca3 100644
--- a/trunk/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c
+++ b/trunk/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c
@@ -656,7 +656,9 @@ int brcmf_net_attach(struct brcmf_if *ifp, bool rtnl_locked)
 	return 0;
 
 fail:
+	drvr->iflist[ifp->bssidx] = NULL;
 	ndev->netdev_ops = NULL;
+	free_netdev(ndev);
 	return -EBADE;
 }
 
@@ -720,6 +722,9 @@ static int brcmf_net_p2p_attach(struct brcmf_if *ifp)
 	return 0;
 
 fail:
+	ifp->drvr->iflist[ifp->bssidx] = NULL;
+	ndev->netdev_ops = NULL;
+	free_netdev(ndev);
 	return -EBADE;
 }
 
@@ -925,8 +930,6 @@ int brcmf_bus_start(struct device *dev)
 			brcmf_fws_del_interface(ifp);
 			brcmf_fws_deinit(drvr);
 		}
-		free_netdev(ifp->ndev);
-		drvr->iflist[0] = NULL;
 		if (p2p_ifp) {
 			free_netdev(p2p_ifp->ndev);
 			drvr->iflist[1] = NULL;
@@ -934,7 +937,8 @@ int brcmf_bus_start(struct device *dev)
 		return ret;
 	}
 	if ((brcmf_p2p_enable) && (p2p_ifp))
-		brcmf_net_p2p_attach(p2p_ifp);
+		if (brcmf_net_p2p_attach(p2p_ifp) < 0)
+			brcmf_p2p_enable = 0;
 
 	return 0;
 }
diff --git a/trunk/drivers/net/wireless/brcm80211/brcmfmac/fweh.c b/trunk/drivers/net/wireless/brcm80211/brcmfmac/fweh.c
index 5a64280e6485..83ee53a7c76e 100644
--- a/trunk/drivers/net/wireless/brcm80211/brcmfmac/fweh.c
+++ b/trunk/drivers/net/wireless/brcm80211/brcmfmac/fweh.c
@@ -202,7 +202,8 @@ static void brcmf_fweh_handle_if_event(struct brcmf_pub *drvr,
 			return;
 		brcmf_fws_add_interface(ifp);
 		if (!drvr->fweh.evt_handler[BRCMF_E_IF])
-			err = brcmf_net_attach(ifp, false);
+			if (brcmf_net_attach(ifp, false) < 0)
+				return;
 	}
 
 	if (ifevent->action == BRCMF_E_IF_CHANGE)