| Index: chromeos/compat-wireless/drivers/net/wireless/p54/eeprom.c
|
| diff --git a/chromeos/compat-wireless/drivers/net/wireless/p54/eeprom.c b/chromeos/compat-wireless/drivers/net/wireless/p54/eeprom.c
|
| index d687cb7f2a599c28d04d6c875f5b4b2796604cdf..0a7ce37aa628af9765fa8ca0fc96350f72f7acb9 100644
|
| --- a/chromeos/compat-wireless/drivers/net/wireless/p54/eeprom.c
|
| +++ b/chromeos/compat-wireless/drivers/net/wireless/p54/eeprom.c
|
| @@ -167,7 +167,7 @@ static int p54_generate_band(struct ieee80211_hw *dev,
|
| }
|
|
|
| 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;
|
| @@ -260,8 +260,10 @@ static int p54_generate_channel_lists(struct ieee80211_hw *dev)
|
| 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) {
|
| @@ -695,12 +697,12 @@ int p54_parse_eeprom(struct ieee80211_hw *dev, void *eeprom, int len)
|
| 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]);
|
|
|
|
|