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: 2e0bc452f4
("net: phy: leds: add support for led triggers on phy link state change")
Signed-off-by: Woojung Huh <woojung.huh@microchip.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Родитель
f52dffe049
Коммит
a7dac9f9c1
|
@ -914,15 +914,15 @@ int phy_attach_direct(struct net_device *dev, struct phy_device *phydev,
|
|||
*/
|
||||
err = phy_init_hw(phydev);
|
||||
if (err)
|
||||
phy_detach(phydev);
|
||||
else
|
||||
phy_resume(phydev);
|
||||
goto error;
|
||||
|
||||
phy_resume(phydev);
|
||||
phy_led_triggers_register(phydev);
|
||||
|
||||
return err;
|
||||
|
||||
error:
|
||||
phy_detach(phydev);
|
||||
put_device(d);
|
||||
module_put(bus->owner);
|
||||
return err;
|
||||
|
|
|
@ -130,7 +130,5 @@ void phy_led_triggers_unregister(struct phy_device *phy)
|
|||
|
||||
for (i = 0; i < phy->phy_num_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);
|
||||
|
|
Загрузка…
Ссылка в новой задаче