From: Eric Sesterhenn tmp in ace_init is u32 thus rendering read_eeprom_byte() return values checks useless. Signed-off-by: Eric Sesterhenn Signed-off-by: Alexey Dobriyan Acked-by: Jes Sorensen Cc: Jeff Garzik Signed-off-by: Andrew Morton --- drivers/net/acenic.c | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff -puN drivers/net/acenic.c~acenic-fix-checking-of-read_eeprom_byte-return-values drivers/net/acenic.c --- devel/drivers/net/acenic.c~acenic-fix-checking-of-read_eeprom_byte-return-values 2006-01-23 03:37:28.000000000 -0800 +++ devel-akpm/drivers/net/acenic.c 2006-01-23 03:37:28.000000000 -0800 @@ -907,6 +907,7 @@ static int __devinit ace_init(struct net u64 tmp_ptr; u32 tig_ver, mac1, mac2, tmp, pci_state; int board_idx, ecode = 0; + int res; short i; unsigned char cache_size; @@ -1003,22 +1004,22 @@ static int __devinit ace_init(struct net mac1 = 0; for(i = 0; i < 4; i++) { mac1 = mac1 << 8; - tmp = read_eeprom_byte(dev, 0x8c+i); - if (tmp < 0) { + res = read_eeprom_byte(dev, 0x8c+i); + if (res < 0) { ecode = -EIO; goto init_error; } else - mac1 |= (tmp & 0xff); + mac1 |= (res & 0xff); } mac2 = 0; for(i = 4; i < 8; i++) { mac2 = mac2 << 8; - tmp = read_eeprom_byte(dev, 0x8c+i); - if (tmp < 0) { + res = read_eeprom_byte(dev, 0x8c+i); + if (res < 0) { ecode = -EIO; goto init_error; } else - mac2 |= (tmp & 0xff); + mac2 |= (res & 0xff); } writel(mac1, ®s->MacAddrHi); _