Skip to content

Commit

Permalink
ARM: Kirkwood: support of_get_mac_address new ERR_PTR error
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Petr Štetiar authored and David S. Miller committed May 6, 2019
1 parent 284eb16 commit c41593a
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion arch/arm/mach-mvebu/kirkwood.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit c41593a

Please sign in to comment.