diff options
author | Sean Paul <seanpaul@chromium.org> | 2018-01-19 18:32:05 +0100 |
---|---|---|
committer | Sean Paul <seanpaul@chromium.org> | 2018-01-19 18:32:05 +0100 |
commit | 54156da8937c9f5f84b4215e239a61ecc7c29275 (patch) | |
tree | 7fb1e07ebedc5fbd35a29f5d450dee538763efdb /drivers/net/phy/mdio_bus.c | |
parent | drm: add kernel doc for exported gem dmabuf_ops (diff) | |
parent | BackMerge tag 'v4.15-rc8' into drm-next (diff) | |
download | linux-54156da8937c9f5f84b4215e239a61ecc7c29275.tar.xz linux-54156da8937c9f5f84b4215e239a61ecc7c29275.zip |
Merge airlied/drm-next into drm-misc-next
It's been a while since we've backmerged drm-next. Dave just brought
back 4.15-rc8, so now's a good time to freshen things up around here.
Signed-off-by: Sean Paul <seanpaul@chromium.org>
Diffstat (limited to 'drivers/net/phy/mdio_bus.c')
-rw-r--r-- | drivers/net/phy/mdio_bus.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/phy/mdio_bus.c b/drivers/net/phy/mdio_bus.c index 2df7b62c1a36..54d00a1d2bef 100644 --- a/drivers/net/phy/mdio_bus.c +++ b/drivers/net/phy/mdio_bus.c @@ -270,6 +270,7 @@ static void of_mdiobus_link_mdiodev(struct mii_bus *bus, if (addr == mdiodev->addr) { dev->of_node = child; + dev->fwnode = of_fwnode_handle(child); return; } } |