From: Jakub Kicinski kuba@kernel.org
[ Upstream commit 973a34c087f43b61b26570110a284faf48d08d5d ]
Use temp to pass to the reading function, the function is generic so can't fix there.
Fixes m68k build.
Signed-off-by: Jakub Kicinski kuba@kernel.org Signed-off-by: David S. Miller davem@davemloft.net Signed-off-by: Sasha Levin sashal@kernel.org --- drivers/net/ethernet/8390/mac8390.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/8390/mac8390.c b/drivers/net/ethernet/8390/mac8390.c index e95a7567bb234..4e2301798be7a 100644 --- a/drivers/net/ethernet/8390/mac8390.c +++ b/drivers/net/ethernet/8390/mac8390.c @@ -301,6 +301,7 @@ static bool __init mac8390_init(struct net_device *dev, struct nubus_dev *ndev, struct nubus_dirent ent; int offset; volatile unsigned short *i; + u8 addr[ETH_ALEN];
printk_once(KERN_INFO pr_fmt("%s"), version);
@@ -326,7 +327,8 @@ static bool __init mac8390_init(struct net_device *dev, struct nubus_dev *ndev, return false; }
- nubus_get_rsrc_mem(dev->dev_addr, &ent, 6); + nubus_get_rsrc_mem(addr, &ent, 6); + eth_hw_addr_set(dev, addr);
if (useresources[cardtype] == 1) { nubus_rewinddir(&dir);