[PATCH v4 09/10] ARM: Kirkwood: support of_get_mac_address new ERR_PTR error

From: Petr Åtetiar
Date: Fri May 03 2019 - 10:37:12 EST


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@xxxxxxx>
---

Changes since v3:

* IS_ERR_OR_NULL -> IS_ERR

arch/arm/mach-mvebu/kirkwood.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/arch/arm/mach-mvebu/kirkwood.c b/arch/arm/mach-mvebu/kirkwood.c
index 0aa8810..9b5f4d6 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);
--
1.9.1