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

Conflicts:
	drivers/net/ethernet/amd/xgbe/xgbe-desc.c
	drivers/net/ethernet/renesas/sh_eth.c

Overlapping changes in both conflict cases.

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 9 insertions, 9 deletions

diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
index 07054ce84ba8..4032b170fe24 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
@@ -276,6 +276,15 @@ static int stmmac_pltfr_probe(struct platform_device *pdev)
 
         plat_dat = dev_get_platdata(&pdev->dev);
 
+        if (!plat_dat)
+                plat_dat = devm_kzalloc(&pdev->dev,
+                                        sizeof(struct plat_stmmacenet_data),
+                                        GFP_KERNEL);
+        if (!plat_dat) {
+                pr_err("%s: ERROR: no memory", __func__);
+                return  -ENOMEM;
+        }
+
         /* Set default value for multicast hash bins */
         plat_dat->multicast_filter_bins = HASH_TABLE_SIZE;
 
@@ -283,15 +292,6 @@ static int stmmac_pltfr_probe(struct platform_device *pdev)
         plat_dat->unicast_filter_entries = 1;
 
         if (pdev->dev.of_node) {
-                if (!plat_dat)
-                        plat_dat = devm_kzalloc(&pdev->dev,
-                                        sizeof(struct plat_stmmacenet_data),
-                                        GFP_KERNEL);
-                if (!plat_dat) {
-                        pr_err("%s: ERROR: no memory", __func__);
-                        return  -ENOMEM;
-                }
-
                 ret = stmmac_probe_config_dt(pdev, plat_dat, &mac);
                 if (ret) {
                         pr_err("%s: main dt probe failed", __func__);