diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-11-17 14:44:50 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-11-17 14:44:50 +0100 |
| commit | 3e4c9e637df1fac4123db5f3165b0034226a671b (patch) | |
| tree | 0a81877a1bd1ed887330c8c06dc485ee172dfbc1 /Documentation | |
| parent | 7d5905dc14a87805a59f3c5bf70173aac2bb18f8 (diff) | |
| parent | f8817f61e8215b0ff1b73a0d33fa04ef9e6bce8b (diff) | |
Merge branch 'pm-core'
* pm-core:
PM / runtime: Drop children check from __pm_runtime_set_status()
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/power/runtime_pm.txt | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Documentation/power/runtime_pm.txt b/Documentation/power/runtime_pm.txt index 57af2f7963ee..937e33c46211 100644 --- a/Documentation/power/runtime_pm.txt +++ b/Documentation/power/runtime_pm.txt @@ -435,8 +435,7 @@ drivers/base/power/runtime.c and include/linux/pm_runtime.h: PM status to 'suspended' and update its parent's counter of 'active' children as appropriate (it is only valid to use this function if 'power.runtime_error' is set or 'power.disable_depth' is greater than - zero); it will fail and return an error code if the device has a child - which is active and the 'power.ignore_children' flag is unset + zero) bool pm_runtime_active(struct device *dev); - return true if the device's runtime PM status is 'active' or its |