diff options
| author | Nisar Sayed <Nisar.Sayed@microchip.com> | 2017-09-20 23:06:37 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-09-22 00:22:53 +0200 |
| commit | c077682282dd34c75e8477c22dffe7c9aebc6e98 (patch) | |
| tree | ee343b027385835554cf14309dee539b01cd707b | |
| parent | lan78xx: Fix for eeprom read/write when device auto suspend (diff) | |
| download | linux-c077682282dd34c75e8477c22dffe7c9aebc6e98.tar.xz linux-c077682282dd34c75e8477c22dffe7c9aebc6e98.zip | |
lan78xx: Allow EEPROM write for less than MAX_EEPROM_SIZE
Allow EEPROM write for less than MAX_EEPROM_SIZE
Fixes: 55d7de9de6c3 ("Microchip's LAN7800 family USB 2/3 to 10/100/1000 Ethernet device driver")
Signed-off-by: Nisar Sayed <Nisar.Sayed@microchip.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/usb/lan78xx.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/net/usb/lan78xx.c b/drivers/net/usb/lan78xx.c index fcf85ae37435..f8c63eec8353 100644 --- a/drivers/net/usb/lan78xx.c +++ b/drivers/net/usb/lan78xx.c @@ -1290,11 +1290,10 @@ static int lan78xx_ethtool_set_eeprom(struct net_device *netdev, if (ret) return ret; - /* Allow entire eeprom update only */ - if ((ee->magic == LAN78XX_EEPROM_MAGIC) && - (ee->offset == 0) && - (ee->len == 512) && - (data[0] == EEPROM_INDICATOR)) + /* Invalid EEPROM_INDICATOR at offset zero will result in a failure + * to load data from EEPROM + */ + if (ee->magic == LAN78XX_EEPROM_MAGIC) ret = lan78xx_write_raw_eeprom(dev, ee->offset, ee->len, data); else if ((ee->magic == LAN78XX_OTP_MAGIC) && (ee->offset == 0) && |