diff options
| author | Petr Štetiar <ynezz@true.cz> | 2019-05-06 23:27:04 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-05-07 12:22:47 -0700 |
| commit | a51645f70f6384ae3329551750f7f502cb8de5fc (patch) | |
| tree | fc9af6d5d1fbcaa88b0eb60e543da7cec1acd12b /drivers/net/ethernet/allwinner | |
| parent | 5503a6889f72d91c9ad156e6daa9ffcdc726ddc5 (diff) | |
| download | lwn-a51645f70f6384ae3329551750f7f502cb8de5fc.tar.gz lwn-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/allwinner')
| -rw-r--r-- | drivers/net/ethernet/allwinner/sun4i-emac.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/allwinner/sun4i-emac.c b/drivers/net/ethernet/allwinner/sun4i-emac.c index e1acafa82214..37ebd890ef51 100644 --- a/drivers/net/ethernet/allwinner/sun4i-emac.c +++ b/drivers/net/ethernet/allwinner/sun4i-emac.c @@ -870,7 +870,7 @@ static int emac_probe(struct platform_device *pdev) /* Read MAC-address from DT */ mac_addr = of_get_mac_address(np); - if (mac_addr) + if (!IS_ERR(mac_addr)) memcpy(ndev->dev_addr, mac_addr, ETH_ALEN); /* Check if the MAC address is valid, if not get a random one */ |