diff options
| author | Petr Štetiar <ynezz@true.cz> | 2019-05-19 14:18:44 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-05-19 10:35:20 -0700 |
| commit | 6a0a923dfa1480df41fb486323b8375e387d516f (patch) | |
| tree | 151c3742be2d70881ea521870f420c17979ece34 | |
| parent | 85806af0c6bac0feb777e255a25fd5d0cf6ad38e (diff) | |
| download | linux-6a0a923dfa1480df41fb486323b8375e387d516f.tar.bz2 | |
of_net: fix of_get_mac_address retval if compiled without CONFIG_OF
of_get_mac_address prior to commit d01f449c008a ("of_net: add NVMEM
support to of_get_mac_address") could return only valid pointer or NULL,
after this change it could return only valid pointer or ERR_PTR encoded
error value, but I've forget to change the return value of
of_get_mac_address in case where the kernel is compiled without
CONFIG_OF, so I'm doing so now.
Cc: Mirko Lindner <mlindner@marvell.com>
Cc: Stephen Hemminger <stephen@networkplumber.org>
Fixes: d01f449c008a ("of_net: add NVMEM support to of_get_mac_address")
Reported-by: Octavio Alvarez <octallk1@alvarezp.org>
Signed-off-by: Petr Štetiar <ynezz@true.cz>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | include/linux/of_net.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/of_net.h b/include/linux/of_net.h index 9cd72aab76fe..0f0346e6829c 100644 --- a/include/linux/of_net.h +++ b/include/linux/of_net.h @@ -22,7 +22,7 @@ static inline int of_get_phy_mode(struct device_node *np) static inline const void *of_get_mac_address(struct device_node *np) { - return NULL; + return ERR_PTR(-ENODEV); } static inline struct net_device *of_find_net_device_by_node(struct device_node *np) |