1 files changed, 25 insertions, 17 deletions

diff --git a/drivers/net/wireless/rt2x00/rt61pci.c b/drivers/net/wireless/rt2x00/rt61pci.c
index 86e7a50374b9..87012f88461f 100644
--- a/drivers/net/wireless/rt2x00/rt61pci.c
+++ b/drivers/net/wireless/rt2x00/rt61pci.c
@@ -2514,10 +2514,11 @@ static const struct rf_channel rf_vals_seq[] = {
         { 46, 0x00002ccc, 0x000049a6, 0x0009be55, 0x000c0a23 },
 };
 
-static void rt61pci_probe_hw_mode(struct rt2x00_dev *rt2x00dev)
+static int rt61pci_probe_hw_mode(struct rt2x00_dev *rt2x00dev)
 {
         struct hw_mode_spec *spec = &rt2x00dev->spec;
-        u8 *txpower;
+        struct channel_info *info;
+        char *tx_power;
         unsigned int i;
 
         /*
@@ -2534,20 +2535,10 @@ static void rt61pci_probe_hw_mode(struct rt2x00_dev *rt2x00dev)
                                                    EEPROM_MAC_ADDR_0));
 
         /*
-         * Convert tx_power array in eeprom.
-         */
-        txpower = rt2x00_eeprom_addr(rt2x00dev, EEPROM_TXPOWER_G_START);
-        for (i = 0; i < 14; i++)
-                txpower[i] = TXPOWER_FROM_DEV(txpower[i]);
-
-        /*
          * Initialize hw_mode information.
          */
         spec->supported_bands = SUPPORT_BAND_2GHZ;
         spec->supported_rates = SUPPORT_RATE_CCK | SUPPORT_RATE_OFDM;
-        spec->tx_power_a = NULL;
-        spec->tx_power_bg = txpower;
-        spec->tx_power_default = DEFAULT_TXPOWER;
 
         if (!test_bit(CONFIG_RF_SEQUENCE, &rt2x00dev->flags)) {
                 spec->num_channels = 14;
@@ -2561,13 +2552,28 @@ static void rt61pci_probe_hw_mode(struct rt2x00_dev *rt2x00dev)
             rt2x00_rf(&rt2x00dev->chip, RF5325)) {
                 spec->supported_bands |= SUPPORT_BAND_5GHZ;
                 spec->num_channels = ARRAY_SIZE(rf_vals_seq);
+        }
+
+        /*
+         * Create channel information array
+         */
+        info = kzalloc(spec->num_channels * sizeof(*info), GFP_KERNEL);
+        if (!info)
+                return -ENOMEM;
+
+        spec->channels_info = info;
 
-                txpower = rt2x00_eeprom_addr(rt2x00dev, EEPROM_TXPOWER_A_START);
-                for (i = 0; i < 14; i++)
-                        txpower[i] = TXPOWER_FROM_DEV(txpower[i]);
+        tx_power = rt2x00_eeprom_addr(rt2x00dev, EEPROM_TXPOWER_G_START);
+        for (i = 0; i < 14; i++)
+                info[i].tx_power1 = TXPOWER_FROM_DEV(tx_power[i]);
 
-                spec->tx_power_a = txpower;
+        if (spec->num_channels > 14) {
+                tx_power = rt2x00_eeprom_addr(rt2x00dev, EEPROM_TXPOWER_A_START);
+                for (i = 14; i < spec->num_channels; i++)
+                        info[i].tx_power1 = TXPOWER_FROM_DEV(tx_power[i]);
         }
+
+        return 0;
 }
 
 static int rt61pci_probe_hw(struct rt2x00_dev *rt2x00dev)
@@ -2588,7 +2594,9 @@ static int rt61pci_probe_hw(struct rt2x00_dev *rt2x00dev)
         /*
          * Initialize hw specifications.
          */
-        rt61pci_probe_hw_mode(rt2x00dev);
+        retval = rt61pci_probe_hw_mode(rt2x00dev);
+        if (retval)
+                return retval;
 
         /*
          * This device requires firmware and DMA mapped skbs.