diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2019-06-26 22:54:48 +0200 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2019-07-06 11:47:22 +0200 |
| commit | fcf0940dcd3ac6cd98a1d062202d8f482a0f519e (patch) | |
| tree | 0ebbcdcfe7bf1aa6b6125362c2931724977f2f5c | |
| parent | 5454ee7334cd6fac8909c110841f192834ffb639 (diff) | |
header: fix of_get_mac_address()
The behavior of of_get_mac_address() changed in kernel 5.2, it now
returns an error code and not NULL in case of an error.
This was changed in upstream kernel commit d01f449c008a
("of_net: add NVMEM support to of_get_mac_address")
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
| -rw-r--r-- | backport/backport-include/linux/of_net.h | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/backport/backport-include/linux/of_net.h b/backport/backport-include/linux/of_net.h index 7f4b688f..18becf5c 100644 --- a/backport/backport-include/linux/of_net.h +++ b/backport/backport-include/linux/of_net.h @@ -12,4 +12,20 @@ static inline const void *of_get_mac_address(struct device_node *np) #endif #endif +/* The behavior of of_get_mac_address() changed in kernel 5.2, it now + * returns an error code and not NULL in case of an error. + */ +#if LINUX_VERSION_IS_LESS(5,2,0) +static inline const void *backport_of_get_mac_address(struct device_node *np) +{ + const void *mac = of_get_mac_address(np); + + if (!mac) + return ERR_PTR(-ENODEV); + + return mac; +} +#define of_get_mac_address LINUX_BACKPORT(of_get_mac_address) +#endif /* < 5.2 */ + #endif /* _BP_OF_NET_H */ |