diff --git a/[refs] b/[refs]
index 18271c13beb6..84cfdf00ecee 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d59f720d88089f2feabe4335839521b26572dc75
+refs/heads/master: 253898c4170c7f426d1bc32860fee04f27de3ade
diff --git a/trunk/net/wireless/reg.c b/trunk/net/wireless/reg.c
index 8cc6037eb2ae..185488da2466 100644
--- a/trunk/net/wireless/reg.c
+++ b/trunk/net/wireless/reg.c
@@ -136,7 +136,10 @@ static void handle_channel(struct ieee80211_channel *chan,
 	chan->flags = flags;
 	chan->max_antenna_gain = min(chan->orig_mag,
 					 rg->max_antenna_gain);
-	chan->max_power = min(chan->orig_mpwr, rg->max_power);
+	if (chan->orig_mpwr)
+		chan->max_power = min(chan->orig_mpwr, rg->max_power);
+	else
+		chan->max_power = rg->max_power;
 }
 
 static void handle_band(struct ieee80211_supported_band *sband,