diff options
author | Petr Štetiar <ynezz@true.cz> | 2019-05-03 10:27:15 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2019-05-06 00:47:07 -0400 |
commit | ea168cdf129944a11471dff5af93fc3c81c22c35 (patch) | |
tree | c62aabfc0fc4bb0969c238903be48b862dc01685 | |
parent | c41593a04e3e9c28da46b13274dc9cb1773b9582 (diff) |
powerpc: tsi108: 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>
-rw-r--r-- | arch/powerpc/sysdev/tsi108_dev.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/sysdev/tsi108_dev.c b/arch/powerpc/sysdev/tsi108_dev.c index 1f1af12f23e2..c92dcac85231 100644 --- a/arch/powerpc/sysdev/tsi108_dev.c +++ b/arch/powerpc/sysdev/tsi108_dev.c | |||
@@ -105,7 +105,7 @@ static int __init tsi108_eth_of_init(void) | |||
105 | } | 105 | } |
106 | 106 | ||
107 | mac_addr = of_get_mac_address(np); | 107 | mac_addr = of_get_mac_address(np); |
108 | if (mac_addr) | 108 | if (!IS_ERR(mac_addr)) |
109 | memcpy(tsi_eth_data.mac_addr, mac_addr, 6); | 109 | memcpy(tsi_eth_data.mac_addr, mac_addr, 6); |
110 | 110 | ||
111 | ph = of_get_property(np, "mdio-handle", NULL); | 111 | ph = of_get_property(np, "mdio-handle", NULL); |