| Message ID | 1558268324-5596-1-git-send-email-ynezz@true.cz |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
| Series | of_net: fix of_get_mac_address retval if compiled without CONFIG_OF | expand |
| Context | Check | Description |
|---|---|---|
| robh/checkpatch | success |
On Sun, May 19, 2019 at 02:18:44PM +0200, Petr Štetiar wrote: > 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> Reviewed-by: Andrew Lunn <andrew@lunn.ch> Andrew
From: Petr Štetiar <ynezz@true.cz> Date: Sun, 19 May 2019 14:18:44 +0200 > 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> Applied, thanks.
Hello! On 19.05.2019 15:18, Petr Štetiar wrote: > 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 It's either "I've forgotten" or just "I forgot". > of_get_mac_address in case where the kernel is compiled without > CONFIG_OF, so I'm doing so now. Well, better late... :-) > 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> [...] MBR, Sergei
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)
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> --- include/linux/of_net.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)