Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
---
drivers/net/e1000/e1000_main.c | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index 2cd4c4b..8f266ed 100644
--- a/drivers/net/e1000/e1000_main.c
+++ b/drivers/net/e1000/e1000_main.c
@@ -1005,17 +1005,19 @@ e1000_probe(struct pci_dev *pdev,
goto err_eeprom;
}

- /* before reading the EEPROM, reset the controller to
- * put the device in a known good starting state */
+ if (e1000_validate_eeprom_checksum(&adapter->hw) < 0) {
+ /* before reading the EEPROM, reset the controller to
+ * put the device in a known good starting state */

- e1000_reset_hw(&adapter->hw);
+ e1000_reset_hw(&adapter->hw);

- /* make sure the EEPROM is good */
+ /* make sure the EEPROM is good */

- if (e1000_validate_eeprom_checksum(&adapter->hw) < 0) {
- DPRINTK(PROBE, ERR, "The EEPROM Checksum Is Not Valid
");
- if (!eeprom_bad_csum_allow)
- goto err_eeprom;
+ if (e1000_validate_eeprom_checksum(&adapter->hw) < 0) {
+ DPRINTK(PROBE, ERR, "The EEPROM Checksum Is Not Valid
");
+ if (!eeprom_bad_csum_allow)
+ goto err_eeprom;
+ }
}

/* copy the MAC address out of the EEPROM */
--
1.5.4.3


--------------060106080606080707000800
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

--
kernel-team mailing list
kernel-team@lists.ubuntu.com
https://lists.ubuntu.com/mailman/listinfo/kernel-team

--------------060106080606080707000800--