From d75fa7c92c6232107b5269d1f0dee42be72c3cba Mon Sep 17 00:00:00 2001
From: "Kok, Auke" <auke-jan.h.kok@intel.com>
Date: Tue, 29 Apr 2008 11:18:55 -0700
Subject: [PATCH] --- yaml --- r: 96223 b: refs/heads/master c:
 f227ec3ca2b7be449fb2156e82b40cceed87a34a h: refs/heads/master i:   96221:
 4ff71b47bd986255d5c64655e45878bc0f2bfdd5   96219:
 542064429d50a7e39656ca337c8ea9a2dc4d6a8c   96215:
 bfbd8db4bdb014d7b8596bb4d66be25f45028806   96207:
 d424e4267ba4f1fff4dd7d3aadc4e5838e7c681d   96191:
 95ef6ed8968a22e6340afe0b03820d796d342def v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/net/e1000e/ethtool.c | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 96dfcdec6c7b..870eb9c08f9b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e410553fd35afd6d290b65e02dc501722406377d
+refs/heads/master: f227ec3ca2b7be449fb2156e82b40cceed87a34a
diff --git a/trunk/drivers/net/e1000e/ethtool.c b/trunk/drivers/net/e1000e/ethtool.c
index 2bb6da057c40..a14561f40db0 100644
--- a/trunk/drivers/net/e1000e/ethtool.c
+++ b/trunk/drivers/net/e1000e/ethtool.c
@@ -494,8 +494,12 @@ static int e1000_get_eeprom(struct net_device *netdev,
 		for (i = 0; i < last_word - first_word + 1; i++) {
 			ret_val = e1000_read_nvm(hw, first_word + i, 1,
 						      &eeprom_buff[i]);
-			if (ret_val)
+			if (ret_val) {
+				/* a read error occurred, throw away the
+				 * result */
+				memset(eeprom_buff, 0xff, sizeof(eeprom_buff));
 				break;
+			}
 		}
 	}