Skip to content

Commit b66010a

Browse files
ynezzclaudiubeznea
authored andcommitted
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>
1 parent 220a0b3 commit b66010a

1 file changed

Lines changed: 2 additions & 1 deletion

File tree

arch/arm/mach-mvebu/kirkwood.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,8 @@ static void __init kirkwood_dt_eth_fixup(void)
9292
continue;
9393

9494
/* skip disabled nodes or nodes with valid MAC address*/
95-
if (!of_device_is_available(pnp) || of_get_mac_address(np))
95+
if (!of_device_is_available(pnp) ||
96+
!IS_ERR(of_get_mac_address(np)))
9697
goto eth_fixup_skip;
9798

9899
clk = of_clk_get(pnp, 0);

0 commit comments

Comments
 (0)