diff --git a/[refs] b/[refs]
index d8f459358a59..e96469f0dd5f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d788766c12f89ebf486101a3f9a30317c324a14b
+refs/heads/master: 124bf340114b74eb0a9f49dd51e855fa2300b565
diff --git a/trunk/drivers/staging/brcm80211/brcmsmac/channel.c b/trunk/drivers/staging/brcm80211/brcmsmac/channel.c
index b9cb892377ed..1aad680c7f62 100644
--- a/trunk/drivers/staging/brcm80211/brcmsmac/channel.c
+++ b/trunk/drivers/staging/brcm80211/brcmsmac/channel.c
@@ -1279,8 +1279,8 @@ brcms_c_channel_reg_limits(struct brcms_cm_info *wlc_cm, u16 chanspec,
 	const struct country_info *country;
 	struct brcms_band *band;
 	const struct locale_info *li;
-	int conducted_max;
-	int conducted_ofdm_max;
+	int conducted_max = BRCMS_TXPWR_MAX;
+	int conducted_ofdm_max = BRCMS_TXPWR_MAX;
 	const struct locale_mimo_info *li_mimo;
 	int maxpwr20, maxpwr40;
 	int maxpwr_idx;