---

yaml --- r: 96223 b: refs/heads/master c: f227ec3 h: refs/heads/master i: 96221: 4ff71b4 96219: 5420644 96215: bfbd8db 96207: d424e42 96191: 95ef6ed v: v3
git-mirror · May 6, 2008 · d75fa7c · d75fa7c
1 parent a89183d
commit d75fa7c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git 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
@@ -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;
+			}
 		}
 	}