---

yaml --- r: 267467 b: refs/heads/master c: 124bf34 h: refs/heads/master i: 267465: 7513733 267463: d4e5f64 v: v3
git-mirror · Aug 23, 2011 · 44363e1 · 44363e1
1 parent 9d50c61
commit 44363e1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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;