diff --git a/[refs] b/[refs]
index 2b220caffdf5..1ecc1ab80e9a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 870d37fc22f3e40f9f23e06c581c8538fc16a2f0
+refs/heads/master: 4f03c1ed8901a01ad4abcef95c02c007a2d481c2
diff --git a/trunk/net/wireless/chan.c b/trunk/net/wireless/chan.c
index 167e7cb60089..019401b0b5e3 100644
--- a/trunk/net/wireless/chan.c
+++ b/trunk/net/wireless/chan.c
@@ -85,6 +85,8 @@ int cfg80211_set_monitor_channel(struct cfg80211_registered_device *rdev,
 
 	if (!rdev->ops->set_monitor_channel)
 		return -EOPNOTSUPP;
+	if (!cfg80211_has_monitors_only(rdev))
+		return -EBUSY;
 
 	chan = rdev_freq_to_chan(rdev, freq, chantype);
 	if (!chan)