| From 5f45f4a91009cc3c6bf0f36d66bb07089bd773ba Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Fri, 20 Aug 2021 09:57:53 +0300 |
| Subject: net: usb: pegasus: fixes of set_register(s) return value evaluation; |
| |
| From: Petko Manolov <petko.manolov@konsulko.com> |
| |
| [ Upstream commit ffc9c3ebb4af870a121da99826e9ccb63dc8b3d7 ] |
| |
| - 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> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/net/usb/pegasus.c | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| diff --git a/drivers/net/usb/pegasus.c b/drivers/net/usb/pegasus.c |
| index fb1a8c4486dd..2a748a924f83 100644 |
| --- a/drivers/net/usb/pegasus.c |
| +++ b/drivers/net/usb/pegasus.c |
| @@ -471,7 +471,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; |
| @@ -861,7 +861,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), |
| -- |
| 2.30.2 |
| |
