Merge tag 'armsoc-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc

[sfrench/cifs-2.6.git] / arch / arm / mach-mvebu / kirkwood.c

diff --git a/arch/arm/mach-mvebu/kirkwood.c b/arch/arm/mach-mvebu/kirkwood.c
index 0aa88105d46e5423c1d98d29ca0f65ab7968f143..9b5f4d665374cd201b0236e3b44bc851460c8a69 100644 (file)
--- 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);