diff options
Diffstat (limited to 'drivers/net/ethernet/arc/emac_main.c')
| -rw-r--r-- | drivers/net/ethernet/arc/emac_main.c | 8 | 
1 files changed, 2 insertions, 6 deletions
| diff --git a/drivers/net/ethernet/arc/emac_main.c b/drivers/net/ethernet/arc/emac_main.c index b56a9e2aecd9..67b8113a2b53 100644 --- a/drivers/net/ethernet/arc/emac_main.c +++ b/drivers/net/ethernet/arc/emac_main.c @@ -857,7 +857,6 @@ int arc_emac_probe(struct net_device *ndev, int interface)  	struct device_node *phy_node;  	struct phy_device *phydev = NULL;  	struct arc_emac_priv *priv; -	const char *mac_addr;  	unsigned int id, clock_frequency, irq;  	int err; @@ -942,11 +941,8 @@ int arc_emac_probe(struct net_device *ndev, int interface)  	}  	/* Get MAC address from device tree */ -	mac_addr = of_get_mac_address(dev->of_node); - -	if (!IS_ERR(mac_addr)) -		ether_addr_copy(ndev->dev_addr, mac_addr); -	else +	err = of_get_mac_address(dev->of_node, ndev->dev_addr); +	if (err)  		eth_hw_addr_random(ndev);  	arc_emac_set_address_internal(ndev); | 
