diff options
| author | Dave Airlie | 2019-03-04 03:02:55 +0100 |
|---|---|---|
| committer | Dave Airlie | 2019-03-04 03:02:55 +0100 |
| commit | 2c3cd66f4c66b169c18a2dbebbc894681d282278 (patch) | |
| tree | 9d2e055ea43e177914a4cce9d007982a7417623c /drivers/net/phy/mdio_bus.c | |
| parent | Merge tag 'imx-drm-next-2019-02-22' of git://git.pengutronix.de/pza/linux int... (diff) | |
| parent | Linux 5.0 (diff) | |
| download | kernel-qcow2-linux-2c3cd66f4c66b169c18a2dbebbc894681d282278.tar.gz kernel-qcow2-linux-2c3cd66f4c66b169c18a2dbebbc894681d282278.tar.xz kernel-qcow2-linux-2c3cd66f4c66b169c18a2dbebbc894681d282278.zip | |
Merge v5.0 into drm-next
There is a really hairy resolution involving amdgpu fixes, that I'd rather confirm here.
Also some misc fixes are landed by me, but the pr has them as well.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/net/phy/mdio_bus.c')
| -rw-r--r-- | drivers/net/phy/mdio_bus.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/phy/mdio_bus.c b/drivers/net/phy/mdio_bus.c index 66b9cfe692fc..7368616286ae 100644 --- a/drivers/net/phy/mdio_bus.c +++ b/drivers/net/phy/mdio_bus.c @@ -379,7 +379,6 @@ int __mdiobus_register(struct mii_bus *bus, struct module *owner) err = device_register(&bus->dev); if (err) { pr_err("mii_bus %s failed to register\n", bus->id); - put_device(&bus->dev); return -EINVAL; } |