diff options
author | 2020-07-27 12:42:15 +0200 | |
---|---|---|
committer | 2020-07-27 12:42:15 +0200 | |
commit | 908e757daecf2120c3019fa630ae5d4c3cd7165b (patch) | |
tree | 652b0f3ecd4a6d7c0066169d6ae466711300197c /drivers/net/usb/ax88172a.c | |
parent | staging: comedi: addi: Replace HTTP links with HTTPS ones (diff) | |
parent | Linux 5.8-rc7 (diff) | |
download | linux-dev-908e757daecf2120c3019fa630ae5d4c3cd7165b.tar.xz linux-dev-908e757daecf2120c3019fa630ae5d4c3cd7165b.zip |
Merge 5.8-rc7 into staging-next
We need the staging fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/net/usb/ax88172a.c')
-rw-r--r-- | drivers/net/usb/ax88172a.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/usb/ax88172a.c b/drivers/net/usb/ax88172a.c index 4e514f5d7c6c..fd3a04d98dc1 100644 --- a/drivers/net/usb/ax88172a.c +++ b/drivers/net/usb/ax88172a.c @@ -187,6 +187,7 @@ static int ax88172a_bind(struct usbnet *dev, struct usb_interface *intf) ret = asix_read_cmd(dev, AX_CMD_READ_NODE_ID, 0, 0, ETH_ALEN, buf, 0); if (ret < ETH_ALEN) { netdev_err(dev->net, "Failed to read MAC address: %d\n", ret); + ret = -EIO; goto free; } memcpy(dev->net->dev_addr, buf, ETH_ALEN); |