[PATCH] UBUNTU: (pre-upstream) FEC: Fix kernel panic in fec_set_mac_address.

[Tim Gardner]

On 05/05/2010 12:19 PM, Bryan Wu wrote:
> From: Mattias Walstrom<mattias at vmlinux.org>
>
> BugLink: http://bugs.launchpad.net/bugs/575558
>
> Fix memory corruption that sometimes result in kernel panic.
>
> Signed-off-by: Mattias Walström<mattias at vmlinux.org>
> Signed-off-by: Bryan Wu<bryan.wu at canonical.com>
> ---
>   drivers/net/fec.c |    2 +-
>   1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/net/fec.c b/drivers/net/fec.c
> index 2280373..d63d18c 100644
> --- a/drivers/net/fec.c
> +++ b/drivers/net/fec.c
> @@ -1049,7 +1049,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;
>   }
>
>

Acked-by: Tim Gardner <tim.gardner at canonical.com>

-- 
Tim Gardner tim.gardner at canonical.com