diff options
| author | David S. Miller <davem@davemloft.net> | 2010-04-07 02:53:30 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-04-07 02:53:30 -0400 |
| commit | 4a35ecf8bf1c4b039503fa554100fe85c761de76 (patch) | |
| tree | 9b75f5d5636004d9a9aa496924377379be09aa1f /drivers/net/ksz884x.c | |
| parent | b4d562e3c3553ac58c7120555c4e4aefbb090a2a (diff) | |
| parent | fb9e2d887243499b8d28efcf80821c4f6a092395 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/bonding/bond_main.c
drivers/net/via-velocity.c
drivers/net/wireless/iwlwifi/iwl-agn.c
Diffstat (limited to 'drivers/net/ksz884x.c')
| -rw-r--r-- | drivers/net/ksz884x.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ksz884x.c b/drivers/net/ksz884x.c index 348769521615..097796423b52 100644 --- a/drivers/net/ksz884x.c +++ b/drivers/net/ksz884x.c | |||
| @@ -6318,7 +6318,7 @@ static int netdev_set_eeprom(struct net_device *dev, | |||
| 6318 | int len; | 6318 | int len; |
| 6319 | 6319 | ||
| 6320 | if (eeprom->magic != EEPROM_MAGIC) | 6320 | if (eeprom->magic != EEPROM_MAGIC) |
| 6321 | return 1; | 6321 | return -EINVAL; |
| 6322 | 6322 | ||
| 6323 | len = (eeprom->offset + eeprom->len + 1) / 2; | 6323 | len = (eeprom->offset + eeprom->len + 1) / 2; |
| 6324 | for (i = eeprom->offset / 2; i < len; i++) | 6324 | for (i = eeprom->offset / 2; i < len; i++) |