Skip to content

Commit

Permalink
of_net: fix of_get_mac_address retval if compiled without CONFIG_OF
Browse files Browse the repository at this point in the history
of_get_mac_address prior to commit d01f449 ("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: d01f449 ("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>
  • Loading branch information
Petr Štetiar authored and David S. Miller committed May 19, 2019
1 parent 85806af commit 6a0a923
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion include/linux/of_net.h
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 6a0a923

Please sign in to comment.