diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-04-04 23:21:09 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-04-04 23:21:09 -0400 |
| commit | 94a46d3cde81fc82eef2105fcb5c9e6e31bac0f7 (patch) | |
| tree | 445ff43779938b539e0799e81c90b85bbee552cd /drivers/net/ksz884x.c | |
| parent | 720fcb36ac1aa2df2c54c170253b6b29600cbefc (diff) | |
| parent | db217dece3003df0841bacf9556b5c06aa097dae (diff) | |
Merge branch 'sh/stable-updates'
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 0f59099ee72f..6c5327af1bf9 100644 --- a/drivers/net/ksz884x.c +++ b/drivers/net/ksz884x.c | |||
| @@ -6322,7 +6322,7 @@ static int netdev_set_eeprom(struct net_device *dev, | |||
| 6322 | int len; | 6322 | int len; |
| 6323 | 6323 | ||
| 6324 | if (eeprom->magic != EEPROM_MAGIC) | 6324 | if (eeprom->magic != EEPROM_MAGIC) |
| 6325 | return 1; | 6325 | return -EINVAL; |
| 6326 | 6326 | ||
| 6327 | len = (eeprom->offset + eeprom->len + 1) / 2; | 6327 | len = (eeprom->offset + eeprom->len + 1) / 2; |
| 6328 | for (i = eeprom->offset / 2; i < len; i++) | 6328 | for (i = eeprom->offset / 2; i < len; i++) |