diff options
| author | Petr Štetiar <ynezz@true.cz> | 2019-05-03 16:27:15 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-05-06 06:47:07 +0200 |
| commit | ea168cdf129944a11471dff5af93fc3c81c22c35 (patch) | |
| tree | c62aabfc0fc4bb0969c238903be48b862dc01685 /arch | |
| parent | ARM: Kirkwood: support of_get_mac_address new ERR_PTR error (diff) | |
| download | linux-ea168cdf129944a11471dff5af93fc3c81c22c35.tar.xz linux-ea168cdf129944a11471dff5af93fc3c81c22c35.zip | |
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>
Diffstat (limited to 'arch')
| -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) } 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); |