git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...
[pandora-kernel.git]
/
include
/
linux
/
device.h
diff --git
a/include/linux/device.h
b/include/linux/device.h
index
dd48953
..
45bc8c1
100644
(file)
--- a/
include/linux/device.h
+++ b/
include/linux/device.h
@@
-508,13
+508,13
@@
static inline int device_is_registered(struct device *dev)
static inline void device_enable_async_suspend(struct device *dev)
{
static inline void device_enable_async_suspend(struct device *dev)
{
- if (
dev->power.status == DPM_ON
)
+ if (
!dev->power.in_suspend
)
dev->power.async_suspend = true;
}
static inline void device_disable_async_suspend(struct device *dev)
{
dev->power.async_suspend = true;
}
static inline void device_disable_async_suspend(struct device *dev)
{
- if (
dev->power.status == DPM_ON
)
+ if (
!dev->power.in_suspend
)
dev->power.async_suspend = false;
}
dev->power.async_suspend = false;
}