A recent commit introduced a late error path in phy_device_create()
which fails to release the device name allocated by dev_set_name().

Fixes: 13d0ab6750b2 ("net: phy: check return code when requesting PHY driver 
module")
Cc: Heiner Kallweit <hkallwe...@gmail.com>
Signed-off-by: Johan Hovold <jo...@kernel.org>
---
 drivers/net/phy/phy_device.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c
index 1b9523595839..57d44648c8dd 100644
--- a/drivers/net/phy/phy_device.c
+++ b/drivers/net/phy/phy_device.c
@@ -615,7 +615,9 @@ struct phy_device *phy_device_create(struct mii_bus *bus, 
int addr, u32 phy_id,
        if (c45_ids)
                dev->c45_ids = *c45_ids;
        dev->irq = bus->irq[addr];
+
        dev_set_name(&mdiodev->dev, PHY_ID_FMT, bus->id, addr);
+       device_initialize(&mdiodev->dev);
 
        dev->state = PHY_DOWN;
 
@@ -649,10 +651,8 @@ struct phy_device *phy_device_create(struct mii_bus *bus, 
int addr, u32 phy_id,
                ret = phy_request_driver_module(dev, phy_id);
        }
 
-       if (!ret) {
-               device_initialize(&mdiodev->dev);
-       } else {
-               kfree(dev);
+       if (ret) {
+               put_device(&mdiodev->dev);
                dev = ERR_PTR(ret);
        }
 
-- 
2.26.2

Reply via email to