Commit 8d93ff40 authored by I Viswanath's avatar I Viswanath Committed by Jakub Kicinski
Browse files

net: usb: lan78xx: fix use of improperly initialized dev->chipid in lan78xx_reset 



dev->chipid is used in lan78xx_init_mac_address before it's initialized:

lan78xx_reset() {
    lan78xx_init_mac_address()
        lan78xx_read_eeprom()
            lan78xx_read_raw_eeprom() <- dev->chipid is used here

    dev->chipid = ... <- dev->chipid is initialized correctly here
}

Reorder initialization so that dev->chipid is set before calling
lan78xx_init_mac_address().

Fixes: a0db7d10 ("lan78xx: Add to handle mux control per chip id")
Signed-off-by: default avatarI Viswanath <viswanathiyyappan@gmail.com>
Reviewed-by: default avatarVadim Fedorenko <vadim.fedorenko@linux.dev>
Reviewed-by: default avatarKhalid Aziz <khalid@kernel.org>
Link: https://patch.msgid.link/20251013181648.35153-1-viswanathiyyappan@gmail.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 5e655aad

drivers/net/usb/lan78xx.c

+4 −4
Original line number Diff line number Diff line
@@ -3250,10 +3250,6 @@ static int lan78xx_reset(struct lan78xx_net *dev) 
		}

	} while (buf & HW_CFG_LRST_);



	ret = lan78xx_init_mac_address(dev);

	if (ret < 0)

		return ret;



	/* save DEVID for later usage */

	ret = lan78xx_read_reg(dev, ID_REV, &buf);

	if (ret < 0)
@@ -3262,6 +3258,10 @@ static int lan78xx_reset(struct lan78xx_net *dev) 
	dev->chipid = (buf & ID_REV_CHIP_ID_MASK_) >> 16;

	dev->chiprev = buf & ID_REV_CHIP_REV_MASK_;



	ret = lan78xx_init_mac_address(dev);

	if (ret < 0)

		return ret;



	/* Respond to the IN token with a NAK */

	ret = lan78xx_read_reg(dev, USB_CFG0, &buf);

	if (ret < 0)