diff --git a/[refs] b/[refs]
index 4354e8015b34..6919467e9afe 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4a0791505639fcbb33b410c2a353d06688909188
+refs/heads/master: 9d2c415612bc6dd300e7feffebf193243536eaea
diff --git a/trunk/drivers/staging/brcm80211/brcmsmac/wl_mac80211.c b/trunk/drivers/staging/brcm80211/brcmsmac/wl_mac80211.c
index 46e765e2cacd..ce115f29d79a 100644
--- a/trunk/drivers/staging/brcm80211/brcmsmac/wl_mac80211.c
+++ b/trunk/drivers/staging/brcm80211/brcmsmac/wl_mac80211.c
@@ -246,6 +246,7 @@ ieee_set_channel(struct ieee80211_hw *hw, struct ieee80211_channel *chan,
 	case NL80211_CHAN_HT40MINUS:
 	case NL80211_CHAN_HT40PLUS:
 		WL_ERROR("%s: Need to implement 40 Mhz Channels!\n", __func__);
+		err = 1;
 		break;
 	}