From f3dd6b48da84a00b0eadd6c0d3e125afdf968021 Mon Sep 17 00:00:00 2001 From: Roel Kluin Date: Tue, 1 Dec 2009 15:54:24 +0000 Subject: [PATCH] --- yaml --- r: 172066 b: refs/heads/master c: 8528b016d64a7c1c97ba6540ab53a538348d5026 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/e1000e/ethtool.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 031b1525fd70..e8f7bf9202ac 100644 --- 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 index b6243cad3103..0aa50c229c79 100644 --- 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++)