Merge tag 'usb-4.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb

[karo-tx-linux.git] / drivers / net / ethernet / broadcom / bgmac-platform.c

diff --git a/drivers/net/ethernet/broadcom/bgmac-platform.c b/drivers/net/ethernet/broadcom/bgmac-platform.c
index 6f736c19872fe304f093f47951ecfe5dd5d2e727..7b1af950f312f30b2b6caae941a2a39e47caa3fd 100644 (file)
--- a/drivers/net/ethernet/broadcom/bgmac-platform.c
+++ b/drivers/net/ethernet/broadcom/bgmac-platform.c
@@ -151,7 +151,7 @@ static int bgmac_probe(struct platform_device *pdev)
        struct resource *regs;
        const u8 *mac_addr;
 
-       bgmac = devm_kzalloc(&pdev->dev, sizeof(*bgmac), GFP_KERNEL);
+       bgmac = bgmac_alloc(&pdev->dev);
        if (!bgmac)
                return -ENOMEM;
 
@@ -169,7 +169,7 @@ static int bgmac_probe(struct platform_device *pdev)
 
        mac_addr = of_get_mac_address(np);
        if (mac_addr)
-               ether_addr_copy(bgmac->mac_addr, mac_addr);
+               ether_addr_copy(bgmac->net_dev->dev_addr, mac_addr);
        else
                dev_warn(&pdev->dev, "MAC address not present in device tree\n");