openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Petr Štetiar 2019-05-03 16:27:14 +02:00 committed by David S. Miller
parent 284eb16068
commit c41593a04e
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arch/arm/mach-mvebu/kirkwood.c
View File

@ -92,7 +92,8 @@ static void __init kirkwood_dt_eth_fixup(void)
continue; continue;
/* skip disabled nodes or nodes with valid MAC address*/ /* 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; goto eth_fixup_skip;
clk = of_clk_get(pnp, 0); clk = of_clk_get(pnp, 0);