Re: [PATCH v2] net: asix: fix uninit value in asix_mdio_read

From: Andrew Lunn
Date: Fri Aug 13 2021 - 18:57:39 EST


> diff --git a/drivers/net/usb/asix_common.c b/drivers/net/usb/asix_common.c
> index ac92bc52a85e..7019c25e591c 100644
> --- a/drivers/net/usb/asix_common.c
> +++ b/drivers/net/usb/asix_common.c
> @@ -468,18 +468,25 @@ int asix_mdio_read(struct net_device *netdev, int phy_id, int loc)
> struct usbnet *dev = netdev_priv(netdev);
> __le16 res;
> u8 smsr;
> - int i = 0;
> + int i;
> int ret;
>
> mutex_lock(&dev->phy_mutex);
> - do {
> + for (i = 0; i < 30; ++i) {
> ret = asix_set_sw_mii(dev, 0);
> if (ret == -ENODEV || ret == -ETIMEDOUT)
> break;
> usleep_range(1000, 1100);
> ret = asix_read_cmd(dev, AX_CMD_STATMNGSTS_REG,
> 0, 0, 1, &smsr, 0);
> - } while (!(smsr & AX_HOST_EN) && (i++ < 30) && (ret != -ENODEV));
> + if (ret == -ENODEV)
> + break;
> + else if (ret < 0)
> + continue;
> + else if (smsr & AX_HOST_EN)
> + break;
> + }
> +

Yes, this looks good. And Jakub is correct, there are 3 other bits of
similar code you should look at.

Andrew