Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d31a36b5 authored by Petr Štetiar's avatar Petr Štetiar Committed by David S. Miller
Browse files

net: wireless: support of_get_mac_address new ERR_PTR error 



There was NVMEM support added to of_get_mac_address, so it could now return
ERR_PTR encoded error values, so we need to adjust all current users of
of_get_mac_address to this new fact.

Signed-off-by: default avatarPetr Štetiar <ynezz@true.cz>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent adfb3cb2

drivers/net/wireless/ath/ath9k/init.c

+1 −1
Original line number Diff line number Diff line
@@ -642,7 +642,7 @@ static int ath9k_of_init(struct ath_softc *sc) 
	}



	mac = of_get_mac_address(np);

	if (mac)

	if (!IS_ERR(mac))

		ether_addr_copy(common->macaddr, mac);



	return 0;

drivers/net/wireless/mediatek/mt76/eeprom.c

+1 −1
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ mt76_eeprom_override(struct mt76_dev *dev) 
		return;



	mac = of_get_mac_address(np);

	if (mac)

	if (!IS_ERR(mac))

		memcpy(dev->macaddr, mac, ETH_ALEN);

#endif

drivers/net/wireless/ralink/rt2x00/rt2x00dev.c

+1 −1
Original line number Diff line number Diff line
@@ -1007,7 +1007,7 @@ void rt2x00lib_set_mac_address(struct rt2x00_dev *rt2x00dev, u8 *eeprom_mac_addr 
	const char *mac_addr;



	mac_addr = of_get_mac_address(rt2x00dev->dev->of_node);

	if (mac_addr)

	if (!IS_ERR(mac_addr))

		ether_addr_copy(eeprom_mac_addr, mac_addr);



	if (!is_valid_ether_addr(eeprom_mac_addr)) {