Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

[karo-tx-linux.git] / drivers / net / ethernet / arc / emac_main.c

diff --git a/drivers/net/ethernet/arc/emac_main.c b/drivers/net/ethernet/arc/emac_main.c
index d0878526c0c86c95d9c238f079c6564ca16c48bc..b2ffad1304d221ef54e60cd1a82138a4d8344975 100644 (file)
--- a/drivers/net/ethernet/arc/emac_main.c
+++ b/drivers/net/ethernet/arc/emac_main.c
@@ -671,6 +671,7 @@ static int arc_emac_probe(struct platform_device *pdev)
        if (!ndev)
                return -ENOMEM;
 
+       platform_set_drvdata(pdev, ndev);
        SET_NETDEV_DEV(ndev, &pdev->dev);
 
        ndev->netdev_ops = &arc_emac_netdev_ops;
@@ -725,10 +726,10 @@ static int arc_emac_probe(struct platform_device *pdev)
        /* Get MAC address from device tree */
        mac_addr = of_get_mac_address(pdev->dev.of_node);
 
-       if (!mac_addr || !is_valid_ether_addr(mac_addr))
-               eth_hw_addr_random(ndev);
-       else
+       if (mac_addr)
                memcpy(ndev->dev_addr, mac_addr, ETH_ALEN);
+       else
+               eth_hw_addr_random(ndev);
 
        dev_info(&pdev->dev, "MAC address is now %pM\n", ndev->dev_addr);