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 <[email protected]>
Cc: Stephen Hemminger <[email protected]>
Fixes: d01f449c008a ("of_net: add NVMEM support to of_get_mac_address")
Reported-by: Octavio Alvarez <[email protected]>
Signed-off-by: Petr Štetiar <[email protected]>
---
include/linux/of_net.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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)
--
1.9.1
From: Petr ?tetiar <[email protected]>
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 <[email protected]>
> Cc: Stephen Hemminger <[email protected]>
> Fixes: d01f449c008a ("of_net: add NVMEM support to of_get_mac_address")
> Reported-by: Octavio Alvarez <[email protected]>
> Signed-off-by: Petr ?tetiar <[email protected]>
Applied, thanks.
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 <[email protected]>
> Cc: Stephen Hemminger <[email protected]>
> Fixes: d01f449c008a ("of_net: add NVMEM support to of_get_mac_address")
> Reported-by: Octavio Alvarez <[email protected]>
> Signed-off-by: Petr Štetiar <[email protected]>
Reviewed-by: Andrew Lunn <[email protected]>
Andrew
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 <[email protected]>
> Cc: Stephen Hemminger <[email protected]>
> Fixes: d01f449c008a ("of_net: add NVMEM support to of_get_mac_address")
> Reported-by: Octavio Alvarez <[email protected]>
> Signed-off-by: Petr Štetiar <[email protected]>
[...]
MBR, Sergei