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 /include/linux/pm_runtime.h | |
| parent | d31199a77ef606f1d06894385f1852181ba6136b (diff) | |
Update 2.6.36 to 2.6.36.4wip-dissipation2-jerickso
Diffstat (limited to 'include/linux/pm_runtime.h')
| -rw-r--r-- | include/linux/pm_runtime.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/pm_runtime.h b/include/linux/pm_runtime.h index 6e81888c6222..5ea4b1582b07 100644 --- a/include/linux/pm_runtime.h +++ b/include/linux/pm_runtime.h | |||
| @@ -67,7 +67,8 @@ static inline void device_set_run_wake(struct device *dev, bool enable) | |||
| 67 | 67 | ||
| 68 | static inline bool pm_runtime_suspended(struct device *dev) | 68 | static inline bool pm_runtime_suspended(struct device *dev) |
| 69 | { | 69 | { |
| 70 | return dev->power.runtime_status == RPM_SUSPENDED; | 70 | return dev->power.runtime_status == RPM_SUSPENDED |
| 71 | && !dev->power.disable_depth; | ||
| 71 | } | 72 | } |
| 72 | 73 | ||
| 73 | #else /* !CONFIG_PM_RUNTIME */ | 74 | #else /* !CONFIG_PM_RUNTIME */ |