diff options
| author | David S. Miller | 2016-12-16 19:29:42 +0100 |
|---|---|---|
| committer | David S. Miller | 2016-12-16 19:29:42 +0100 |
| commit | ea7a2b9ac853d8c3afd929952ad4b3cb65ba329c (patch) | |
| tree | 4be808deee2e6c332c049996ba73b8e1225cd484 /drivers/net/ethernet/hisilicon/hisi_femac.c | |
| parent | net: dsa: mv88e6xxx: Fix opps when adding vlan bridge (diff) | |
| parent | net: ethernet: hip04: Call SET_NETDEV_DEV() (diff) | |
| download | kernel-qcow2-linux-ea7a2b9ac853d8c3afd929952ad4b3cb65ba329c.tar.gz kernel-qcow2-linux-ea7a2b9ac853d8c3afd929952ad4b3cb65ba329c.tar.xz kernel-qcow2-linux-ea7a2b9ac853d8c3afd929952ad4b3cb65ba329c.zip | |
Merge branch 'hisilicon-netdev-dev'
Dongpo Li says:
====================
net: ethernet: hisilicon: set dev->dev.parent before PHY connect
This patch series builds atop:
ec988ad78ed6d184a7f4ca6b8e962b0e8f1de461 ("phy: Don't increment MDIO bus
refcount unless it's a different owner")
I have checked all the hisilicon ethernet driver and found only two drivers
need to be fixed to make sure set dev->dev.parent before PHY connect.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/hisilicon/hisi_femac.c')
| -rw-r--r-- | drivers/net/ethernet/hisilicon/hisi_femac.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/hisilicon/hisi_femac.c b/drivers/net/ethernet/hisilicon/hisi_femac.c index 49863068c59e..979852d56f31 100644 --- a/drivers/net/ethernet/hisilicon/hisi_femac.c +++ b/drivers/net/ethernet/hisilicon/hisi_femac.c @@ -805,6 +805,7 @@ static int hisi_femac_drv_probe(struct platform_device *pdev) return -ENOMEM; platform_set_drvdata(pdev, ndev); + SET_NETDEV_DEV(ndev, &pdev->dev); priv = netdev_priv(ndev); priv->dev = dev; @@ -882,7 +883,6 @@ static int hisi_femac_drv_probe(struct platform_device *pdev) ndev->netdev_ops = &hisi_femac_netdev_ops; ndev->ethtool_ops = &hisi_femac_ethtools_ops; netif_napi_add(ndev, &priv->napi, hisi_femac_poll, FEMAC_POLL_WEIGHT); - SET_NETDEV_DEV(ndev, &pdev->dev); hisi_femac_port_init(priv); |