diff options
author | Petr Štetiar <ynezz@true.cz> | 2019-05-03 10:27:11 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2019-05-06 00:47:07 -0400 |
commit | adfb3cb2c52e7bf215ac5d97344e4ed57ab9ce9f (patch) | |
tree | c22b4c51646ba9bf67c30695a6231204f2822465 /drivers/net/usb | |
parent | f7af25a6ca1605af9d2611ae1ba02096a9c2e9df (diff) |
net: usb: support of_get_mac_address new ERR_PTR error
There was NVMEM support added to of_get_mac_address, so it could now return
ERR_PTR encoded error values, so we need to adjust all current users of
of_get_mac_address to this new fact.
Signed-off-by: Petr Štetiar <ynezz@true.cz>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/usb')
-rw-r--r-- | drivers/net/usb/smsc75xx.c | 2 | ||||
-rw-r--r-- | drivers/net/usb/smsc95xx.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/usb/smsc75xx.c b/drivers/net/usb/smsc75xx.c index ec287c9741e8..d27b627b4317 100644 --- a/drivers/net/usb/smsc75xx.c +++ b/drivers/net/usb/smsc75xx.c | |||
@@ -774,7 +774,7 @@ static void smsc75xx_init_mac_address(struct usbnet *dev) | |||
774 | 774 | ||
775 | /* maybe the boot loader passed the MAC address in devicetree */ | 775 | /* maybe the boot loader passed the MAC address in devicetree */ |
776 | mac_addr = of_get_mac_address(dev->udev->dev.of_node); | 776 | mac_addr = of_get_mac_address(dev->udev->dev.of_node); |
777 | if (mac_addr) { | 777 | if (!IS_ERR(mac_addr)) { |
778 | memcpy(dev->net->dev_addr, mac_addr, ETH_ALEN); | 778 | memcpy(dev->net->dev_addr, mac_addr, ETH_ALEN); |
779 | return; | 779 | return; |
780 | } | 780 | } |
diff --git a/drivers/net/usb/smsc95xx.c b/drivers/net/usb/smsc95xx.c index e3d08626828e..ab239113351d 100644 --- a/drivers/net/usb/smsc95xx.c +++ b/drivers/net/usb/smsc95xx.c | |||
@@ -917,7 +917,7 @@ static void smsc95xx_init_mac_address(struct usbnet *dev) | |||
917 | 917 | ||
918 | /* maybe the boot loader passed the MAC address in devicetree */ | 918 | /* maybe the boot loader passed the MAC address in devicetree */ |
919 | mac_addr = of_get_mac_address(dev->udev->dev.of_node); | 919 | mac_addr = of_get_mac_address(dev->udev->dev.of_node); |
920 | if (mac_addr) { | 920 | if (!IS_ERR(mac_addr)) { |
921 | memcpy(dev->net->dev_addr, mac_addr, ETH_ALEN); | 921 | memcpy(dev->net->dev_addr, mac_addr, ETH_ALEN); |
922 | return; | 922 | return; |
923 | } | 923 | } |