Update compat-wireless to 2.6.36-5-spn

chromeos/compat-wireless/drivers/net/wireless/p54/eeprom.c

 /*
  * EEPROM parser code for mac80211 Prism54 drivers
  *
  * Copyright (c) 2006, Michael Wu <flamingice@sourmilk.net>
  * Copyright (c) 2007-2009, Christian Lamparter <chunkeey@web.de>
  * Copyright 2008, Johannes Berg <johannes@sipsolutions.net>
  *
  * Based on:
  * - the islsm (softmac prism54) driver, which is:
  *   Copyright 2004-2006 Jean-Baptiste Note <jbnote@gmail.com>, et al.
@@ skipping 149 matching lines @@
                                   list->channels[i].index, list->channels[i].freq);
                         continue;
                 }
 
                 tmp->channels[j].band = list->channels[i].band;
                 tmp->channels[j].center_freq = list->channels[i].freq;
                 j++;
         }
 
         if (j == 0) {
-                wiphy_err(dev->wiphy, "disabling totally damaged %d GHz band\n",
+                wiphy_err(dev->wiphy, "Disabling totally damaged %d GHz band\n",
                           (band == IEEE80211_BAND_2GHZ) ? 2 : 5);
 
                 ret = -ENODATA;
                 goto err_out;
         }
 
         tmp->n_channels = j;
         old = priv->band_table[band];
         priv->band_table[band] = tmp;
         if (old) {
@@ skipping 72 matching lines @@
 
         list = kzalloc(sizeof(*list), GFP_KERNEL);
         if (!list) {
                 ret = -ENOMEM;
                 goto free;
         }
 
         list->max_entries = max_channel_num;
         list->channels = kzalloc(sizeof(struct p54_channel_entry) *
                                  max_channel_num, GFP_KERNEL);
-        if (!list->channels)
+        if (!list->channels) {
+                ret = -ENOMEM;
                 goto free;
+        }
 
         for (i = 0; i < max_channel_num; i++) {
                 if (i < priv->iq_autocal_len) {
                         freq = le16_to_cpu(priv->iq_autocal[i].freq);
                         p54_update_channel_param(list, freq, CHAN_HAS_CAL);
                 }
 
                 if (i < priv->output_limit->entries) {
                         freq = le16_to_cpup((__le16 *) (i *
                                             priv->output_limit->entry_size +
@@ skipping 413 matching lines @@
                         priv->band_table[IEEE80211_BAND_5GHZ];
         if ((synth & PDR_SYNTH_RX_DIV_MASK) == PDR_SYNTH_RX_DIV_SUPPORTED)
                 priv->rx_diversity_mask = 3;
         if ((synth & PDR_SYNTH_TX_DIV_MASK) == PDR_SYNTH_TX_DIV_SUPPORTED)
                 priv->tx_diversity_mask = 3;
 
         if (!is_valid_ether_addr(dev->wiphy->perm_addr)) {
                 u8 perm_addr[ETH_ALEN];
 
                 wiphy_warn(dev->wiphy,
-                           "invalid hwaddr! using randomly generated mac addr\n");
+                           "Invalid hwaddr! Using randomly generated MAC addr\n");
                 random_ether_addr(perm_addr);
                 SET_IEEE80211_PERM_ADDR(dev, perm_addr);
         }
 
-        wiphy_info(dev->wiphy, "hwaddr %pm, mac:isl38%02x rf:%s\n",
+        wiphy_info(dev->wiphy, "hwaddr %pM, MAC:isl38%02x RF:%s\n",
                    dev->wiphy->perm_addr, priv->version,
                    p54_rf_chips[priv->rxhw]);
 
         return 0;
 
 err:
         kfree(priv->iq_autocal);
         kfree(priv->output_limit);
         kfree(priv->curve_data);
         priv->iq_autocal = NULL;
@@ skipping 32 matching lines @@
                 offset += blocksize;
                 eeprom_size -= blocksize;
         }
 
         ret = p54_parse_eeprom(dev, eeprom, offset);
 free:
         kfree(eeprom);
         return ret;
 }
 EXPORT_SYMBOL_GPL(p54_read_eeprom);