e1000: "fix" it on thinkpad x60

From: Pavel Machek
Date: Thu Jul 20 2006 - 11:57:30 EST


e1000 in thinkpad x60 fails without this dirty hack. What to do with
it?

Signed-off-by: Pavel Machek <pavel@xxxxxxx>

---
commit 6414eba4f65ded35f3a8f2d61261d1134e292506
tree e6560bba2cc0d18b76075e6b5db415d6c0c31db3
parent fa6f216422f9020c06dd1137aec8c72224cbe440
author <pavel@xxxxxxxxxx> Fri, 21 Jul 2006 02:16:52 +0200
committer <pavel@xxxxxxxxxx> Fri, 21 Jul 2006 02:16:52 +0200

drivers/net/e1000/e1000_main.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index 6e7d31b..808c442 100644
--- a/drivers/net/e1000/e1000_main.c
+++ b/drivers/net/e1000/e1000_main.c
@@ -842,8 +842,10 @@ e1000_probe(struct pci_dev *pdev,

if (e1000_validate_eeprom_checksum(&adapter->hw) < 0) {
DPRINTK(PROBE, ERR, "The EEPROM Checksum Is Not Valid\n");
+/*
err = -EIO;
goto err_eeprom;
+*/
}

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

--
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/