Commit 284eb160 authored by Petr Štetiar's avatar Petr Štetiar Committed by David S. Miller

staging: octeon-ethernet: 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 d31a36b5
...@@ -421,7 +421,7 @@ int cvm_oct_common_init(struct net_device *dev) ...@@ -421,7 +421,7 @@ int cvm_oct_common_init(struct net_device *dev)
if (priv->of_node) if (priv->of_node)
mac = of_get_mac_address(priv->of_node); mac = of_get_mac_address(priv->of_node);
if (mac) if (!IS_ERR(mac))
ether_addr_copy(dev->dev_addr, mac); ether_addr_copy(dev->dev_addr, mac);
else else
eth_hw_addr_random(dev); eth_hw_addr_random(dev);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment