diff options
author | Paul Mundt <lethal@linux-sh.org> | 2011-06-24 17:16:40 +0900 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2011-06-24 17:16:40 +0900 |
commit | 20733d59d5763ecd96276f868c1f39e677b3b4e2 (patch) | |
tree | 89177676a2a45afa97595ce1827630aa131c51e2 /include/linux/device.h | |
parent | 75e1b6a84f7e2186e843da94751b6d175caf9209 (diff) | |
parent | 17e8c4e1ebf139743e3830439fa65fd906af4a43 (diff) |
Merge branch 'fbdev/stable-updates'
Diffstat (limited to 'include/linux/device.h')
-rw-r--r-- | include/linux/device.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/device.h b/include/linux/device.h index c66111affca..553fd37b173 100644 --- a/include/linux/device.h +++ b/include/linux/device.h @@ -654,13 +654,13 @@ static inline int device_is_registered(struct device *dev) static inline void device_enable_async_suspend(struct device *dev) { - if (!dev->power.in_suspend) + if (!dev->power.is_prepared) dev->power.async_suspend = true; } static inline void device_disable_async_suspend(struct device *dev) { - if (!dev->power.in_suspend) + if (!dev->power.is_prepared) dev->power.async_suspend = false; } |