diff options
| author | Petr Štetiar <ynezz@true.cz> | 2019-05-07 00:27:04 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-05-07 22:22:47 +0300 |
| commit | a51645f70f6384ae3329551750f7f502cb8de5fc (patch) | |
| tree | fc9af6d5d1fbcaa88b0eb60e543da7cec1acd12b /drivers/net/ethernet/aeroflex | |
| parent | 5503a6889f72d91c9ad156e6daa9ffcdc726ddc5 (diff) | |
| download | linux-a51645f70f6384ae3329551750f7f502cb8de5fc.tar.xz | |
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/aeroflex')
| -rw-r--r-- | drivers/net/ethernet/aeroflex/greth.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/aeroflex/greth.c b/drivers/net/ethernet/aeroflex/greth.c index 47e5984f16fb..7c5cf0224a70 100644 --- a/drivers/net/ethernet/aeroflex/greth.c +++ b/drivers/net/ethernet/aeroflex/greth.c @@ -1459,7 +1459,7 @@ static int greth_of_probe(struct platform_device *ofdev) const u8 *addr; addr = of_get_mac_address(ofdev->dev.of_node); - if (addr) { + if (!IS_ERR(addr)) { for (i = 0; i < 6; i++) macaddr[i] = (unsigned int) addr[i]; } else { |