diff options
| author | David S. Miller <davem@davemloft.net> | 2010-12-27 01:37:05 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-12-27 01:37:05 -0500 |
| commit | 17f7f4d9fcce8f1b75b5f735569309dee7665968 (patch) | |
| tree | 14d7e49ca0053a0fcab3c33b5023bf3f90c5c08a /include/linux/pm_runtime.h | |
| parent | 041110a439e21cd40709ead4ffbfa8034619ad77 (diff) | |
| parent | d7c1255a3a21e98bdc64df8ccf005a174d7e6289 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
net/ipv4/fib_frontend.c
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 3ec2358f8692..d19f1cca7f74 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) | |||
| 77 | 77 | ||
| 78 | static inline bool pm_runtime_suspended(struct device *dev) | 78 | static inline bool pm_runtime_suspended(struct device *dev) |
| 79 | { | 79 | { |
| 80 | return dev->power.runtime_status == RPM_SUSPENDED; | 80 | return dev->power.runtime_status == RPM_SUSPENDED |
| 81 | && !dev->power.disable_depth; | ||
| 81 | } | 82 | } |
| 82 | 83 | ||
| 83 | static inline void pm_runtime_mark_last_busy(struct device *dev) | 84 | static inline void pm_runtime_mark_last_busy(struct device *dev) |