net: sxgbe: Fix NULL dereferece when using DT

[firefly-linux-kernel-4.4.55.git] / drivers / net / ethernet / samsung / sxgbe / sxgbe_platform.c

diff --git a/drivers/net/ethernet/samsung/sxgbe/sxgbe_platform.c b/drivers/net/ethernet/samsung/sxgbe/sxgbe_platform.c
index 7fd6e275d1c20bf3208c1b5f09061bac82567ad6..b02eed12bfc5743117285216db1b4fe6ba19536e 100644 (file)
--- a/drivers/net/ethernet/samsung/sxgbe/sxgbe_platform.c
+++ b/drivers/net/ethernet/samsung/sxgbe/sxgbe_platform.c
@@ -108,10 +108,6 @@ static int sxgbe_platform_probe(struct platform_device *pdev)
                }
        }
 
-       /* Get MAC address if available (DT) */
-       if (mac)
-               ether_addr_copy(priv->dev->dev_addr, mac);
-
        priv = sxgbe_drv_probe(&(pdev->dev), plat_dat, addr);
        if (!priv) {
                pr_err("%s: main driver probe failed\n", __func__);
@@ -125,6 +121,10 @@ static int sxgbe_platform_probe(struct platform_device *pdev)
                goto err_drv_remove;
        }
 
+       /* Get MAC address if available (DT) */
+       if (mac)
+               ether_addr_copy(priv->dev->dev_addr, mac);
+
        /* Get the TX/RX IRQ numbers */
        for (i = 0, chan = 1; i < SXGBE_TX_QUEUES; i++) {
                priv->txq[i]->irq_no = irq_of_parse_and_map(node, chan++);
@@ -233,7 +233,6 @@ static struct platform_driver sxgbe_platform_driver = {
        .remove = sxgbe_platform_remove,
        .driver = {
                .name           = SXGBE_RESOURCE_NAME,
-               .owner          = THIS_MODULE,
                .pm             = &sxgbe_platform_pm_ops,
                .of_match_table = of_match_ptr(sxgbe_dt_ids),
        },