FPGA/corundum
1
0
Fork 0
mirror of https://github.com/corundum/corundum.git synced 2025-01-16 08:12:53 +08:00
Code Issues Projects Releases Wiki Activity

Fix EEPROM-related error handling in ethtool interface code

Browse Source
This commit is contained in:
Alex Forencich 2022-03-20 23:07:45 -07:00
parent 8aa2185bfb
commit c118565d21
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
modules/mqnic/mqnic_ethtool.c
View File

@ -87,7 +87,7 @@ static int mqnic_read_module_eeprom(struct net_device *ndev,
struct mqnic_priv *priv = netdev_priv(ndev);
if (!priv->mod_i2c_client)
return -1;
return -EINVAL;
if (len > I2C_SMBUS_BLOCK_MAX)
len = I2C_SMBUS_BLOCK_MAX;
@ -105,6 +105,9 @@ static int mqnic_get_module_info(struct net_device *ndev,
// read module ID and revision
read_len = mqnic_read_module_eeprom(ndev, 0, 2, data);
if (read_len < 0)
return read_len;
if (read_len < 2)
return -EIO;
@ -157,11 +160,11 @@ static int mqnic_get_module_eeprom(struct net_device *ndev,
eeprom->len - i, data + i);
if (read_len == 0)
return -EIO;
return 0;
if (read_len < 0) {
dev_err(priv->dev, "Failed to read module EEPROM");
return 0;
return read_len;
}
i += read_len;