Skip to content

Commit

Permalink
powerpc: tsi108: 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 c41593a commit ea168cd
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion arch/powerpc/sysdev/tsi108_dev.c
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ static int __init tsi108_eth_of_init(void)
}

mac_addr = of_get_mac_address(np);
if (mac_addr)
if (!IS_ERR(mac_addr))
memcpy(tsi_eth_data.mac_addr, mac_addr, 6);

ph = of_get_property(np, "mdio-handle", NULL);
Expand Down

0 comments on commit ea168cd

Please sign in to comment.