Merge branch 'powercap'
* powercap: powercap/drivers/dtpm: Add the experimental label to the option description powercap/drivers/dtpm: Fix root node initialization
This commit is contained in:
commit
7bff4c26b6
|
@ -45,7 +45,7 @@ config IDLE_INJECT
|
|||
on a per CPU basis.
|
||||
|
||||
config DTPM
|
||||
bool "Power capping for Dynamic Thermal Power Management"
|
||||
bool "Power capping for Dynamic Thermal Power Management (EXPERIMENTAL)"
|
||||
help
|
||||
This enables support for the power capping for the dynamic
|
||||
thermal power management userspace engine.
|
||||
|
|
|
@ -207,6 +207,9 @@ int dtpm_release_zone(struct powercap_zone *pcz)
|
|||
if (dtpm->ops)
|
||||
dtpm->ops->release(dtpm);
|
||||
|
||||
if (root == dtpm)
|
||||
root = NULL;
|
||||
|
||||
kfree(dtpm);
|
||||
|
||||
return 0;
|
||||
|
|
Loading…
Reference in New Issue