diff options
author | Ingo Molnar <mingo@kernel.org> | 2018-02-26 08:39:26 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2018-02-26 08:41:15 +0100 |
commit | 3f7df3efeb415610d27aecc282ff96d4a22f0168 (patch) | |
tree | 0f66382746a1311043a25320243ff5f4b10c282e /drivers/net/usb/smsc75xx.c | |
parent | 39b9552281abfcdfc54162897018890dafe7ffef (diff) | |
parent | 4a3928c6f8a53fa1aed28ccba227742486e8ddcb (diff) | |
download | linux-3f7df3efeb415610d27aecc282ff96d4a22f0168.tar.gz |
Merge tag 'v4.16-rc3' into x86/mm, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/net/usb/smsc75xx.c')
-rw-r--r-- | drivers/net/usb/smsc75xx.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/net/usb/smsc75xx.c b/drivers/net/usb/smsc75xx.c index d0a113743195..7a6a1fe79309 100644 --- a/drivers/net/usb/smsc75xx.c +++ b/drivers/net/usb/smsc75xx.c @@ -954,10 +954,11 @@ static int smsc75xx_set_features(struct net_device *netdev, /* it's racing here! */ ret = smsc75xx_write_reg(dev, RFE_CTL, pdata->rfe_ctl); - if (ret < 0) + if (ret < 0) { netdev_warn(dev->net, "Error writing RFE_CTL\n"); - - return ret; + return ret; + } + return 0; } static int smsc75xx_wait_ready(struct usbnet *dev, int in_pm) |