diff options
| author | Petr Štetiar | 2019-05-06 23:27:04 +0200 |
|---|---|---|
| committer | David S. Miller | 2019-05-07 21:22:47 +0200 |
| commit | a51645f70f6384ae3329551750f7f502cb8de5fc (patch) | |
| tree | fc9af6d5d1fbcaa88b0eb60e543da7cec1acd12b /drivers/net/ethernet/lantiq_xrx200.c | |
| parent | net: usb: smsc: fix warning reported by kbuild test robot (diff) | |
| download | kernel-qcow2-linux-a51645f70f6384ae3329551750f7f502cb8de5fc.tar.gz kernel-qcow2-linux-a51645f70f6384ae3329551750f7f502cb8de5fc.tar.xz kernel-qcow2-linux-a51645f70f6384ae3329551750f7f502cb8de5fc.zip | |
net: 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.
While at it, remove superfluous is_valid_ether_addr as the MAC address
returned from of_get_mac_address is always valid and checked by
is_valid_ether_addr anyway.
Fixes: d01f449c008a ("of_net: add NVMEM support to of_get_mac_address")
Signed-off-by: Petr Štetiar <ynezz@true.cz>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/lantiq_xrx200.c')
| -rw-r--r-- | drivers/net/ethernet/lantiq_xrx200.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/lantiq_xrx200.c b/drivers/net/ethernet/lantiq_xrx200.c index d29104de0d53..cda641ef89af 100644 --- a/drivers/net/ethernet/lantiq_xrx200.c +++ b/drivers/net/ethernet/lantiq_xrx200.c @@ -478,7 +478,7 @@ static int xrx200_probe(struct platform_device *pdev) } mac = of_get_mac_address(np); - if (mac && is_valid_ether_addr(mac)) + if (!IS_ERR(mac)) ether_addr_copy(net_dev->dev_addr, mac); else eth_hw_addr_random(net_dev); |