diff options
| author |   Petr Štetiar <ynezz@true.cz> | 2019-05-03 16:27:11 +0200 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2019-05-05 21:47:07 -0700 |
| commit | adfb3cb2c52e7bf215ac5d97344e4ed57ab9ce9f (patch) | |
| tree | c22b4c51646ba9bf67c30695a6231204f2822465 /drivers/net/usb | |
| parent | net: davinci: support of_get_mac_address new ERR_PTR error (diff) | |
| download | linux-dev-adfb3cb2c52e7bf215ac5d97344e4ed57ab9ce9f.tar.xz linux-dev-adfb3cb2c52e7bf215ac5d97344e4ed57ab9ce9f.zip | |
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) /* maybe the boot loader passed the MAC address in devicetree */ mac_addr = of_get_mac_address(dev->udev->dev.of_node); - if (mac_addr) { + if (!IS_ERR(mac_addr)) { memcpy(dev->net->dev_addr, mac_addr, ETH_ALEN); return; } 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) /* maybe the boot loader passed the MAC address in devicetree */ mac_addr = of_get_mac_address(dev->udev->dev.of_node); - if (mac_addr) { + if (!IS_ERR(mac_addr)) { memcpy(dev->net->dev_addr, mac_addr, ETH_ALEN); return; } |