diff options
| author | Andrey Smirnov <andrew.smirnov@gmail.com> | 2018-12-12 23:03:34 -0800 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2018-12-17 10:41:56 +0100 |
| commit | 15b1ec44fef09bcf6095d9bb43dd38baa0b99f01 (patch) | |
| tree | d05e68f5a3733db5b84736f22b4d00c878191a50 /drivers/net | |
| parent | 1f5c33154d90db41489983152351e6410586482e (diff) | |
| download | barebox-15b1ec44fef09bcf6095d9bb43dd38baa0b99f01.tar.gz barebox-15b1ec44fef09bcf6095d9bb43dd38baa0b99f01.tar.xz | |
net/e1000: Do not discard EEPROM error code in e1000_setup_link()
E1000_read_eeprom() returns a number of different error codes, so
propagate them up the caller chain instead of reducing it to
E1000_READ_EEPROM.
Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/e1000/main.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/net/e1000/main.c b/drivers/net/e1000/main.c index caa7274a8d..d631e44b6e 100644 --- a/drivers/net/e1000/main.c +++ b/drivers/net/e1000/main.c @@ -840,10 +840,11 @@ static int e1000_setup_link(struct e1000_hw *hw) * control setting, then the variable hw->fc will * be initialized based on a value in the EEPROM. */ - if (e1000_read_eeprom(hw, EEPROM_INIT_CONTROL2_REG, 1, - &eeprom_data) < 0) { + ret_val = e1000_read_eeprom(hw, EEPROM_INIT_CONTROL2_REG, 1, + &eeprom_data); + if (ret_val < 0) { dev_dbg(hw->dev, "EEPROM Read Error\n"); - return -E1000_ERR_EEPROM; + return ret_val; } switch (hw->mac_type) { |