diff --git a/[refs] b/[refs]
index eaf8d7a57631..3ff42f965186 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d13e14148154e5ce58467e76321eef1dd912c416
+refs/heads/master: f8cdddb8d61d16a156229f0910f7ecfc7a82c003
diff --git a/trunk/net/wireless/util.c b/trunk/net/wireless/util.c
index 8f2d68fc3a44..316cfd00914f 100644
--- a/trunk/net/wireless/util.c
+++ b/trunk/net/wireless/util.c
@@ -804,7 +804,7 @@ int cfg80211_change_iface(struct cfg80211_registered_device *rdev,
 	     ntype == NL80211_IFTYPE_P2P_CLIENT))
 		return -EBUSY;
 
-	if (ntype != otype) {
+	if (ntype != otype && netif_running(dev)) {
 		err = cfg80211_can_change_interface(rdev, dev->ieee80211_ptr,
 						    ntype);
 		if (err)