Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit daacf03f authored by Laurent Pinchart's avatar Laurent Pinchart Committed by David S. Miller
Browse files

sh_eth: Register MDIO bus before registering the network device 



Network API functions that rely on the MDIO bus can be called as soon as
the driver calls register_netdev(). Register the MDIO bus before the
network device to avoid race conditions.

Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Acked-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent bd920ff5

drivers/net/ethernet/renesas/sh_eth.c

+9 −11
Original line number Diff line number Diff line
@@ -2891,6 +2891,13 @@ static int sh_eth_drv_probe(struct platform_device *pdev) 
		}

	}



	/* MDIO bus init */

	ret = sh_mdio_init(mdp, pd);

	if (ret) {

		dev_err(&ndev->dev, "failed to initialise MDIO\n");

		goto out_release;

	}



	netif_napi_add(ndev, &mdp->napi, sh_eth_poll, 64);



	/* network device register */
@@ -2898,13 +2905,6 @@ static int sh_eth_drv_probe(struct platform_device *pdev) 
	if (ret)

		goto out_napi_del;



	/* mdio bus init */

	ret = sh_mdio_init(mdp, pd);

	if (ret) {

		dev_err(&ndev->dev, "failed to initialise MDIO\n");

		goto out_unregister;

	}



	/* print device information */

	netdev_info(ndev, "Base address at 0x%x, %pM, IRQ %d.\n",

		    (u32)ndev->base_addr, ndev->dev_addr, ndev->irq);
@@ -2913,11 +2913,9 @@ static int sh_eth_drv_probe(struct platform_device *pdev) 


	return ret;



out_unregister:

	unregister_netdev(ndev);



out_napi_del:

	netif_napi_del(&mdp->napi);

	sh_mdio_release(mdp);



out_release:

	/* net_dev free */
@@ -2933,9 +2931,9 @@ static int sh_eth_drv_remove(struct platform_device *pdev) 
	struct net_device *ndev = platform_get_drvdata(pdev);

	struct sh_eth_private *mdp = netdev_priv(ndev);



	sh_mdio_release(mdp);

	unregister_netdev(ndev);

	netif_napi_del(&mdp->napi);

	sh_mdio_release(mdp);

	pm_runtime_disable(&pdev->dev);

	free_netdev(ndev);