From a2caaf288deb51d874dc52738d14b992783a98c1 Mon Sep 17 00:00:00 2001
From: Michal Kazior <michal.kazior@tieto.com>
Date: Fri, 8 Jun 2012 10:55:44 +0200
Subject: [PATCH] --- yaml --- r: 311375 b: refs/heads/master c:
 f8cdddb8d61d16a156229f0910f7ecfc7a82c003 h: refs/heads/master i:   311373:
 524b9101acbed95b12c7c48dd5179946a3643617   311371:
 a9e5b4123d3c92be9dee2797908776cd5711f0ab   311367:
 2db7c6ae619195ef613d1eb143c82b77e42eaad8   311359:
 f286e50404d8806efff8e230822cd6b55f601fcc v: v3

---
 [refs]                    | 2 +-
 trunk/net/wireless/util.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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)