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

Commit 1472d599 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'ethernet-missing-netdev-parent'



Florian Fainelli says:

====================
net: ethernet: Make sure we set dev->dev.parent

This patch series builds atop:

ec988ad7 ("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: default avatarDavid S. Miller <davem@davemloft.net>
parents c4587631 5579f28c
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -704,6 +704,7 @@ ltq_etop_probe(struct platform_device *pdev)
	priv->pldata = dev_get_platdata(&pdev->dev);
	priv->netdev = dev;
	spin_lock_init(&priv->lock);
	SET_NETDEV_DEV(dev, &pdev->dev);

	for (i = 0; i < MAX_DMA_CHAN; i++) {
		if (IS_TX(i))
+1 −0
Original line number Diff line number Diff line
@@ -1113,6 +1113,7 @@ static int cpmac_probe(struct platform_device *pdev)
	if (!dev)
		return -ENOMEM;

	SET_NETDEV_DEV(dev, &pdev->dev);
	platform_set_drvdata(pdev, dev);
	priv = netdev_priv(dev);