From fcf0940dcd3ac6cd98a1d062202d8f482a0f519e Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Wed, 26 Jun 2019 22:54:48 +0200 Subject: 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 --- backport/backport-include/linux/of_net.h | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) 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 */ -- cgit v1.2.3