Merge branch 'pm-powercap'

Fix a possible memory leak in the power capping subsystem (Joe Hattori).

* pm-powercap:
  powercap: call put_device() on an error path in powercap_register_control_type()
This commit is contained in:
Rafael J. Wysocki 2025-02-07 12:43:58 +01:00
commit 73195bed78

View file

@ -627,8 +627,7 @@ struct powercap_control_type *powercap_register_control_type(
dev_set_name(&control_type->dev, "%s", name); dev_set_name(&control_type->dev, "%s", name);
result = device_register(&control_type->dev); result = device_register(&control_type->dev);
if (result) { if (result) {
if (control_type->allocated) put_device(&control_type->dev);
kfree(control_type);
return ERR_PTR(result); return ERR_PTR(result);
} }
idr_init(&control_type->idr); idr_init(&control_type->idr);