Merge git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq

[linux-2.6] / net / wireless / reg.c

diff --git a/net/wireless/reg.c b/net/wireless/reg.c
index 8cc6037eb2aede16e748c7afa8f1cdbf745925b2..185488da246647c06bd85261f856a71fed182c34 100644 (file)
--- a/net/wireless/reg.c
+++ b/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,