diff --git a/[refs] b/[refs]
index 95b27b94a8cb..7f64a99d773d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f68d776a04bfcebc426f605c4440ffe38c583a4b
+refs/heads/master: 683d41ae6755e6ae297ec09603c229795ab9566e
diff --git a/trunk/net/wireless/util.c b/trunk/net/wireless/util.c
index 1c2795d52db0..d7873c7ae0ec 100644
--- a/trunk/net/wireless/util.c
+++ b/trunk/net/wireless/util.c
@@ -1212,7 +1212,8 @@ int cfg80211_can_use_iftype_chan(struct cfg80211_registered_device *rdev,
 	case NL80211_IFTYPE_MESH_POINT:
 	case NL80211_IFTYPE_P2P_GO:
 	case NL80211_IFTYPE_WDS:
-		radar_required = !!(chan->flags & IEEE80211_CHAN_RADAR);
+		radar_required = !!(chan &&
+				    (chan->flags & IEEE80211_CHAN_RADAR));
 		break;
 	case NL80211_IFTYPE_P2P_CLIENT:
 	case NL80211_IFTYPE_STATION: