diff options
| author | Petr Štetiar <ynezz@true.cz> | 2019-05-03 16:27:14 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-05-06 06:47:07 +0200 |
| commit | c41593a04e3e9c28da46b13274dc9cb1773b9582 (patch) | |
| tree | c71aaa31fd2183b42996a0ce4392235bba1379ea /arch/arm/mach-mvebu/kirkwood.c | |
| parent | staging: octeon-ethernet: support of_get_mac_address new ERR_PTR error (diff) | |
| download | linux-c41593a04e3e9c28da46b13274dc9cb1773b9582.tar.xz linux-c41593a04e3e9c28da46b13274dc9cb1773b9582.zip | |
ARM: Kirkwood: 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: Petr Štetiar <ynezz@true.cz>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/arm/mach-mvebu/kirkwood.c')
| -rw-r--r-- | arch/arm/mach-mvebu/kirkwood.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-mvebu/kirkwood.c b/arch/arm/mach-mvebu/kirkwood.c index 0aa88105d46e..9b5f4d665374 100644 --- a/arch/arm/mach-mvebu/kirkwood.c +++ b/arch/arm/mach-mvebu/kirkwood.c @@ -92,7 +92,8 @@ static void __init kirkwood_dt_eth_fixup(void) continue; /* skip disabled nodes or nodes with valid MAC address*/ - if (!of_device_is_available(pnp) || of_get_mac_address(np)) + if (!of_device_is_available(pnp) || + !IS_ERR(of_get_mac_address(np))) goto eth_fixup_skip; clk = of_clk_get(pnp, 0); |