diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2021-03-05 16:19:10 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2021-03-05 16:19:10 +0100 |
| commit | 7bff4c26b6d2c82bebf8630f31b1cca11b1bd562 (patch) | |
| tree | 956701a4501518418f0dd38a1cae97045c927ee7 | |
| parent | 44cc89f764646b2f1f2ea5d1a08b230131707851 (diff) | |
| parent | 9e2be308f023a741a0d4024bef508ef88dfb3a43 (diff) | |
| download | linux-7bff4c26b6d2c82bebf8630f31b1cca11b1bd562.tar.gz | |
Merge branch 'powercap'
* powercap:
powercap/drivers/dtpm: Add the experimental label to the option description
powercap/drivers/dtpm: Fix root node initialization
| -rw-r--r-- | drivers/powercap/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/powercap/dtpm.c | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/drivers/powercap/Kconfig b/drivers/powercap/Kconfig index 20b4325c6161cb..8242e8c5ed77ec 100644 --- a/drivers/powercap/Kconfig +++ b/drivers/powercap/Kconfig @@ -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. diff --git a/drivers/powercap/dtpm.c b/drivers/powercap/dtpm.c index 5a51cd34a7e870..c2185ec5f887b9 100644 --- a/drivers/powercap/dtpm.c +++ b/drivers/powercap/dtpm.c @@ -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; |