Skip to content

Commit 1472d59

Browse files
committed
Merge branch 'ethernet-missing-netdev-parent'
Florian Fainelli says: ==================== net: ethernet: Make sure we set dev->dev.parent This patch series builds atop: ec988ad ("phy: Don't increment MDIO bus refcount unless it's a different owner") FMAN is the one that potentially needs patching as well (call SET_NETDEV_DEV), but there appears to be no way that init_phy is called right now, or there is not such an in-tree user. Madalin, can you comment on that? ==================== Signed-off-by: David S. Miller <[email protected]>
2 parents c458763 + 5579f28 commit 1472d59

File tree

2 files changed

+2
-0
lines changed

2 files changed

+2
-0
lines changed

drivers/net/ethernet/lantiq_etop.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -704,6 +704,7 @@ ltq_etop_probe(struct platform_device *pdev)
704704
priv->pldata = dev_get_platdata(&pdev->dev);
705705
priv->netdev = dev;
706706
spin_lock_init(&priv->lock);
707+
SET_NETDEV_DEV(dev, &pdev->dev);
707708

708709
for (i = 0; i < MAX_DMA_CHAN; i++) {
709710
if (IS_TX(i))

drivers/net/ethernet/ti/cpmac.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1113,6 +1113,7 @@ static int cpmac_probe(struct platform_device *pdev)
11131113
if (!dev)
11141114
return -ENOMEM;
11151115

1116+
SET_NETDEV_DEV(dev, &pdev->dev);
11161117
platform_set_drvdata(pdev, dev);
11171118
priv = netdev_priv(dev);
11181119

0 commit comments

Comments
 (0)