diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2006-01-26 22:19:57 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2006-01-26 22:19:57 -0500 |
| commit | 97309d1a0bbdcb0813ea08574b4473d8e5416012 (patch) | |
| tree | 0dcbcf5aa5146147e0ac1d0c4b73b868a67d333b /drivers/net/acenic.c | |
| parent | b4ea75b649417606fd6b38710a2962ec9770e772 (diff) | |
| parent | efd51b5c6798d103e3aa683464aebb2019b62119 (diff) | |
| download | kernel_samsung_smdk4412-97309d1a0bbdcb0813ea08574b4473d8e5416012.zip kernel_samsung_smdk4412-97309d1a0bbdcb0813ea08574b4473d8e5416012.tar.gz kernel_samsung_smdk4412-97309d1a0bbdcb0813ea08574b4473d8e5416012.tar.bz2 | |
Merge branch 'upstream-fixes'
Diffstat (limited to 'drivers/net/acenic.c')
| -rw-r--r-- | drivers/net/acenic.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/acenic.c b/drivers/net/acenic.c index b8953de..b508812 100644 --- a/drivers/net/acenic.c +++ b/drivers/net/acenic.c @@ -1002,6 +1002,8 @@ static int __devinit ace_init(struct net_device *dev) mac1 = 0; for(i = 0; i < 4; i++) { + int tmp; + mac1 = mac1 << 8; tmp = read_eeprom_byte(dev, 0x8c+i); if (tmp < 0) { @@ -1012,6 +1014,8 @@ static int __devinit ace_init(struct net_device *dev) } mac2 = 0; for(i = 4; i < 8; i++) { + int tmp; + mac2 = mac2 << 8; tmp = read_eeprom_byte(dev, 0x8c+i); if (tmp < 0) { |