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 /net/ethernet | |
| parent | 5503a6889f72d91c9ad156e6daa9ffcdc726ddc5 (diff) | |
| download | linux-a51645f70f6384ae3329551750f7f502cb8de5fc.tar.bz2 | |
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 'net/ethernet')
| -rw-r--r-- | net/ethernet/eth.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ethernet/eth.c b/net/ethernet/eth.c index fddcee38c1da..4b2b222377ac 100644 --- a/net/ethernet/eth.c +++ b/net/ethernet/eth.c @@ -560,7 +560,7 @@ int eth_platform_get_mac_address(struct device *dev, u8 *mac_addr) addr = NULL; if (dp) addr = of_get_mac_address(dp); - if (!addr) + if (IS_ERR_OR_NULL(addr)) addr = arch_get_platform_mac_address(); if (!addr) |