diff options
| author | Petr Štetiar <ynezz@true.cz> | 2019-05-03 16:27:12 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-05-05 21:47:07 -0700 |
| commit | d31a36b5f407d796d121af745730712337cd32a1 (patch) | |
| tree | a3c34575135ffa786021c3cd823697a074f2683c /drivers/net/wireless/ralink | |
| parent | adfb3cb2c52e7bf215ac5d97344e4ed57ab9ce9f (diff) | |
| download | blackbird-op-linux-d31a36b5f407d796d121af745730712337cd32a1.tar.gz blackbird-op-linux-d31a36b5f407d796d121af745730712337cd32a1.zip | |
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: Petr Štetiar <ynezz@true.cz>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/wireless/ralink')
| -rw-r--r-- | drivers/net/wireless/ralink/rt2x00/rt2x00dev.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c b/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c index bdc55d649a88..1b08b01db27b 100644 --- a/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c +++ b/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c @@ -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)) { |
