From: Mattias Walström <mattias@vmlinux.org>
Date: Wed, 5 May 2010 07:55:48 +0000 (-0700)
Subject: FEC: Fix kernel panic in fec_set_mac_address.
X-Git-Tag: v3.12-rc1~10390^2~9
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7cff0943a1104479fc9fc2d6ced24c02ba81e73e;p=kernel%2Fkernel-generic.git

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>
---

diff --git a/drivers/net/fec.c b/drivers/net/fec.c
index 9f98c1c..9b4e8f7 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;
 }