Commit a7dac9f9 authored by Woojung Huh's avatar Woojung Huh Committed by David S. Miller

phy: fix error case of phy_led_triggers_(un)register

When phy_init_hw() fails at phy_attach_direct();
- phy_detach() calls phy_led_triggers_unregister() without
  previous call of phy_led_triggers_register().
- still call phy_led_triggers_register() and cause memory leak.

Fixes: 2e0bc452 ("net: phy: leds: add support for led triggers on phy link state change")
Signed-off-by: default avatarWoojung Huh <woojung.huh@microchip.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f52dffe0
...@@ -914,15 +914,15 @@ int phy_attach_direct(struct net_device *dev, struct phy_device *phydev, ...@@ -914,15 +914,15 @@ int phy_attach_direct(struct net_device *dev, struct phy_device *phydev,
*/ */
err = phy_init_hw(phydev); err = phy_init_hw(phydev);
if (err) if (err)
phy_detach(phydev); goto error;
else
phy_resume(phydev);
phy_resume(phydev);
phy_led_triggers_register(phydev); phy_led_triggers_register(phydev);
return err; return err;
error: error:
phy_detach(phydev);
put_device(d); put_device(d);
module_put(bus->owner); module_put(bus->owner);
return err; return err;
......
...@@ -130,7 +130,5 @@ void phy_led_triggers_unregister(struct phy_device *phy) ...@@ -130,7 +130,5 @@ void phy_led_triggers_unregister(struct phy_device *phy)
for (i = 0; i < phy->phy_num_led_triggers; i++) for (i = 0; i < phy->phy_num_led_triggers; i++)
phy_led_trigger_unregister(&phy->phy_led_triggers[i]); phy_led_trigger_unregister(&phy->phy_led_triggers[i]);
devm_kfree(&phy->mdio.dev, phy->phy_led_triggers);
} }
EXPORT_SYMBOL_GPL(phy_led_triggers_unregister); EXPORT_SYMBOL_GPL(phy_led_triggers_unregister);
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment