diff --git a/[refs] b/[refs]
index bba48cabe7f0..6e53f725e1e5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 71e233a2abc11a8b4263e4883e90f9fbe01fd806
+refs/heads/master: 683fbb42396106974c315897d8d379f9e7b8ee40
diff --git a/trunk/drivers/staging/brcm80211/brcmsmac/mac80211_if.c b/trunk/drivers/staging/brcm80211/brcmsmac/mac80211_if.c
index 1fa95d71973c..6787498cb04d 100644
--- a/trunk/drivers/staging/brcm80211/brcmsmac/mac80211_if.c
+++ b/trunk/drivers/staging/brcm80211/brcmsmac/mac80211_if.c
@@ -341,7 +341,10 @@ brcms_ops_add_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif)
 
 	wl = hw->priv;
 	LOCK(wl);
-	err = brcms_up(wl);
+	if (!wl->pub->up)
+		err = brcms_up(wl);
+	else
+		err = -ENODEV;
 	UNLOCK(wl);
 
 	if (err != 0)