summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorMattias Walström <mattias@vmlinux.org>2010-05-05 00:55:48 -0700
committerDavid S. Miller <davem@davemloft.net>2010-05-05 00:55:48 -0700
commit7cff0943a1104479fc9fc2d6ced24c02ba81e73e (patch)
treeafda069dcdff2f06d22bc45fcb89a1eb58dadd67 /drivers
parentf935aa9e99d6ec74a50871c120e6b21de7256efb (diff)
downloadlinux-3.10-7cff0943a1104479fc9fc2d6ced24c02ba81e73e.tar.gz
linux-3.10-7cff0943a1104479fc9fc2d6ced24c02ba81e73e.tar.bz2
linux-3.10-7cff0943a1104479fc9fc2d6ced24c02ba81e73e.zip
FEC: Fix kernel panic in fec_set_mac_address.
Fix memory corruption that sometimes result in kernel panic. Signed-off-by: Mattias Walström <mattias@vmlinux.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/fec.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/fec.c b/drivers/net/fec.c
index 9f98c1c4a34..9b4e8f797a7 100644
--- a/drivers/net/fec.c
+++ b/drivers/net/fec.c
@@ -1653,7 +1653,7 @@ fec_set_mac_address(struct net_device *dev, void *p)
(dev->dev_addr[1] << 16) | (dev->dev_addr[0] << 24),
fep->hwp + FEC_ADDR_LOW);
writel((dev->dev_addr[5] << 16) | (dev->dev_addr[4] << 24),
- fep + FEC_ADDR_HIGH);
+ fep->hwp + FEC_ADDR_HIGH);
return 0;
}