ich777/linux_media
1
0
Fork 0
mirror of https://github.com/tbsdtv/linux_media.git synced 2025-07-23 12:43:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

net: ethernet: support of_get_mac_address new ERR_PTR error

Browse Source 
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.

While at it, remove superfluous is_valid_ether_addr as the MAC address
returned from of_get_mac_address is always valid and checked by
is_valid_ether_addr anyway.

Fixes: d01f449c00 ("of_net: add NVMEM support to of_get_mac_address")
Signed-off-by: Petr Štetiar <ynezz@true.cz>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Petr Štetiar
2019-05-06 23:27:04 +02:00
committed by David S. Miller
parent 5503a6889f
commit a51645f70f
45 changed files with 45 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
net/ethernet/eth.c
View File

@@ -560,7 +560,7 @@ int eth_platform_get_mac_address(struct device *dev, u8 *mac_addr)
addr = NULL;
if (dp)
addr = of_get_mac_address(dp);
if (!addr)
if (IS_ERR_OR_NULL(addr))
addr = arch_get_platform_mac_address();
if (!addr)