aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-12-17 09:31:59 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2010-12-17 09:31:59 -0800
commit508817e7cd8cb585148d12b5673202142ece2330 (patch)
tree5041771f203c906afce49d9e75e5e856f77a903f /include
parent8efc1a1a22e6daf9d669e6095460c77df683c325 (diff)
parentf08f5a0add20834d3f3d876dfe08005a5df656db (diff)
downloadkernel_samsung_smdk4412-508817e7cd8cb585148d12b5673202142ece2330.zip
kernel_samsung_smdk4412-508817e7cd8cb585148d12b5673202142ece2330.tar.gz
kernel_samsung_smdk4412-508817e7cd8cb585148d12b5673202142ece2330.tar.bz2
Merge branch 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6
* 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6: PM / Runtime: Fix pm_runtime_suspended() PM / Hibernate: Restore old swap signature to avoid user space breakage PM / Hibernate: Fix PM_POST_* notification with user-space suspend
Diffstat (limited to 'include')
-rw-r--r--include/linux/pm_runtime.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/pm_runtime.h b/include/linux/pm_runtime.h
index 3ec2358..d19f1cc 100644
--- a/include/linux/pm_runtime.h
+++ b/include/linux/pm_runtime.h
@@ -77,7 +77,8 @@ static inline void device_set_run_wake(struct device *dev, bool enable)
static inline bool pm_runtime_suspended(struct device *dev)
{
- return dev->power.runtime_status == RPM_SUSPENDED;
+ return dev->power.runtime_status == RPM_SUSPENDED
+ && !dev->power.disable_depth;
}
static inline void pm_runtime_mark_last_busy(struct device *dev)