diff options
| author |   Petko Manolov <petko.manolov@konsulko.com> | 2021-08-20 09:57:53 +0300 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2021-08-20 14:57:05 +0100 |
| commit | ffc9c3ebb4af870a121da99826e9ccb63dc8b3d7 (patch) | |
| tree | a68547de86f511153ee4c0908b3e4f50a5300e43 /drivers/net/usb/pegasus.c | |
| parent | net: qrtr: fix another OOB Read in qrtr_endpoint_post (diff) | |
| download | linux-dev-ffc9c3ebb4af870a121da99826e9ccb63dc8b3d7.tar.xz linux-dev-ffc9c3ebb4af870a121da99826e9ccb63dc8b3d7.zip | |
net: usb: pegasus: fixes of set_register(s) return value evaluation;
- restore the behavior in enable_net_traffic() to avoid regressions - Jakub
Kicinski;
- hurried up and removed redundant assignment in pegasus_open() before yet
another checker complains;
Fixes: 8a160e2e9aeb ("net: usb: pegasus: Check the return value of get_geristers() and friends;")
Reported-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Petko Manolov <petko.manolov@konsulko.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/usb/pegasus.c')
| -rw-r--r-- | drivers/net/usb/pegasus.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/usb/pegasus.c b/drivers/net/usb/pegasus.c index 652e9fcf0b77..9f9dd0de33cb 100644 --- a/drivers/net/usb/pegasus.c +++ b/drivers/net/usb/pegasus.c @@ -446,7 +446,7 @@ static int enable_net_traffic(struct net_device *dev, struct usb_device *usb) write_mii_word(pegasus, 0, 0x1b, &auxmode); } - return 0; + return ret; fail: netif_dbg(pegasus, drv, pegasus->net, "%s failed\n", __func__); return ret; @@ -835,7 +835,7 @@ static int pegasus_open(struct net_device *net) if (!pegasus->rx_skb) goto exit; - res = set_registers(pegasus, EthID, 6, net->dev_addr); + set_registers(pegasus, EthID, 6, net->dev_addr); usb_fill_bulk_urb(pegasus->rx_urb, pegasus->usb, usb_rcvbulkpipe(pegasus->usb, 1), |