mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-12-24 19:45:06 +08:00
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>
This commit is contained in:
parent
f7af25a6ca
commit
adfb3cb2c5
@ -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;
|
||||
}
|
||||
|
@ -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;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user