diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-08-13 05:04:54 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-08-13 05:04:54 +0000 |
| commit | 1be3dd63ab5702f33c8cfcab726655e092d45358 (patch) | |
| tree | 180b6c6e5339f3bf576e0e315951497978294b06 /drivers/net/usb | |
| parent | Releasing progress-linux version 6.10.3-1~progress7.99u1. (diff) | |
| download | linux-1be3dd63ab5702f33c8cfcab726655e092d45358.tar.xz linux-1be3dd63ab5702f33c8cfcab726655e092d45358.zip | |
Merging upstream version 6.10.4.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'drivers/net/usb')
| -rw-r--r-- | drivers/net/usb/sr9700.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/drivers/net/usb/sr9700.c b/drivers/net/usb/sr9700.c index 0a662e42ed..cb7d2f798f 100644 --- a/drivers/net/usb/sr9700.c +++ b/drivers/net/usb/sr9700.c @@ -179,6 +179,7 @@ static int sr_mdio_read(struct net_device *netdev, int phy_id, int loc) struct usbnet *dev = netdev_priv(netdev); __le16 res; int rc = 0; + int err; if (phy_id) { netdev_dbg(netdev, "Only internal phy supported\n"); @@ -189,11 +190,17 @@ static int sr_mdio_read(struct net_device *netdev, int phy_id, int loc) if (loc == MII_BMSR) { u8 value; - sr_read_reg(dev, SR_NSR, &value); + err = sr_read_reg(dev, SR_NSR, &value); + if (err < 0) + return err; + if (value & NSR_LINKST) rc = 1; } - sr_share_read_word(dev, 1, loc, &res); + err = sr_share_read_word(dev, 1, loc, &res); + if (err < 0) + return err; + if (rc == 1) res = le16_to_cpu(res) | BMSR_LSTATUS; else |