diff options
author | Jeremy Erickson <jerickso@cs.unc.edu> | 2014-04-18 17:06:00 -0400 |
---|---|---|
committer | Jeremy Erickson <jerickso@cs.unc.edu> | 2014-04-18 17:06:00 -0400 |
commit | a215aa7b9ab3759c047201199fba64d3042d7f13 (patch) | |
tree | bca37493d9b2233450e6d3ffced1261d0e4f71fe /Documentation/power | |
parent | d31199a77ef606f1d06894385f1852181ba6136b (diff) |
Update 2.6.36 to 2.6.36.4wip-dissipation2-jerickso
Diffstat (limited to 'Documentation/power')
-rw-r--r-- | Documentation/power/runtime_pm.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/power/runtime_pm.txt b/Documentation/power/runtime_pm.txt index 55b859b3bc72..506d9d916e41 100644 --- a/Documentation/power/runtime_pm.txt +++ b/Documentation/power/runtime_pm.txt | |||
@@ -336,8 +336,8 @@ drivers/base/power/runtime.c and include/linux/pm_runtime.h: | |||
336 | zero) | 336 | zero) |
337 | 337 | ||
338 | bool pm_runtime_suspended(struct device *dev); | 338 | bool pm_runtime_suspended(struct device *dev); |
339 | - return true if the device's runtime PM status is 'suspended', or false | 339 | - return true if the device's runtime PM status is 'suspended' and its |
340 | otherwise | 340 | 'power.disable_depth' field is equal to zero, or false otherwise |
341 | 341 | ||
342 | void pm_runtime_allow(struct device *dev); | 342 | void pm_runtime_allow(struct device *dev); |
343 | - set the power.runtime_auto flag for the device and decrease its usage | 343 | - set the power.runtime_auto flag for the device and decrease its usage |