Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git...

[pandora-kernel.git] / include / linux / device.h

diff --git a/include/linux/device.h b/include/linux/device.h
index 1e2d335..1bf5cf0 100644 (file)
--- a/include/linux/device.h
+++ b/include/linux/device.h
@@ -196,6 +196,7 @@ struct class {
 
        struct class_attribute          *class_attrs;
        struct device_attribute         *dev_attrs;
+       struct bin_attribute            *dev_bin_attrs;
        struct kobject                  *dev_kobj;
 
        int (*dev_uevent)(struct device *dev, struct kobj_uevent_env *env);
@@ -507,13 +508,13 @@ static inline int device_is_registered(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)
 {
-       if (dev->power.status == DPM_ON)
+       if (!dev->power.in_suspend)
                dev->power.async_suspend = false;
 }