diff options
| author | Sean Paul <seanpaul@chromium.org> | 2019-10-23 17:14:11 +0200 |
|---|---|---|
| committer | Sean Paul <seanpaul@chromium.org> | 2019-10-23 17:14:11 +0200 |
| commit | 44bf67f32a6803339ac1ba721b158c3e2272cabe (patch) | |
| tree | 1ed93503a4a1d20005b85df91bd81e5f5982f348 /drivers/net/ethernet/atheros/ag71xx.c | |
| parent | Revert "drm/omap: add OMAP_BO flags to affect buffer allocation" (diff) | |
| parent | Merge v5.4-rc4 into drm-next (diff) | |
| download | linux-44bf67f32a6803339ac1ba721b158c3e2272cabe.tar.xz linux-44bf67f32a6803339ac1ba721b158c3e2272cabe.zip | |
Merge drm/drm-next into drm-misc-next
Parroting Daniel's backmerge justification from
2e79e22e092acd55da0b2db066e4826d7d152c41:
Thierry needs fd70c7755bf0 ("drm/bridge: tc358767: fix max_tu_symbol
value") to be able to merge his dp_link patch series.
Signed-off-by: Sean Paul <seanpaul@chromium.org>
Diffstat (limited to 'drivers/net/ethernet/atheros/ag71xx.c')
| -rw-r--r-- | drivers/net/ethernet/atheros/ag71xx.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/ethernet/atheros/ag71xx.c b/drivers/net/ethernet/atheros/ag71xx.c index 7548247455d7..1b1a09095c0d 100644 --- a/drivers/net/ethernet/atheros/ag71xx.c +++ b/drivers/net/ethernet/atheros/ag71xx.c @@ -526,7 +526,7 @@ static int ag71xx_mdio_probe(struct ag71xx *ag) struct device *dev = &ag->pdev->dev; struct net_device *ndev = ag->ndev; static struct mii_bus *mii_bus; - struct device_node *np; + struct device_node *np, *mnp; int err; np = dev->of_node; @@ -571,7 +571,9 @@ static int ag71xx_mdio_probe(struct ag71xx *ag) msleep(200); } - err = of_mdiobus_register(mii_bus, np); + mnp = of_get_child_by_name(np, "mdio"); + err = of_mdiobus_register(mii_bus, mnp); + of_node_put(mnp); if (err) goto mdio_err_put_clk; |