---

yaml --- r: 172066 b: refs/heads/master c: 8528b01 h: refs/heads/master v: v3
git-mirror · Dec 2, 2009 · f3dd6b4 · f3dd6b4
1 parent e84c75f
commit f3dd6b4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 07f025e6bad7292af3904b8f49cd33e7b5fe3467
+refs/heads/master: 8528b016d64a7c1c97ba6540ab53a538348d5026
diff --git a/trunk/drivers/net/e1000e/ethtool.c b/trunk/drivers/net/e1000e/ethtool.c
@@ -535,7 +535,8 @@ static int e1000_get_eeprom(struct net_device *netdev,
 
 	if (ret_val) {
 		/* a read error occurred, throw away the result */
-		memset(eeprom_buff, 0xff, sizeof(eeprom_buff));
+		memset(eeprom_buff, 0xff, sizeof(u16) *
+		       (last_word - first_word + 1));
 	} else {
 		/* Device's eeprom is always little-endian, word addressable */
 		for (i = 0; i < last_word - first_word + 1; i++)