diff options
Diffstat (limited to 'include/linux/device.h')
-rw-r--r-- | include/linux/device.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/include/linux/device.h b/include/linux/device.h index c66111affca9..e4f62d8896b7 100644 --- a/include/linux/device.h +++ b/include/linux/device.h | |||
@@ -530,7 +530,6 @@ struct device_dma_parameters { | |||
530 | * @dma_mem: Internal for coherent mem override. | 530 | * @dma_mem: Internal for coherent mem override. |
531 | * @archdata: For arch-specific additions. | 531 | * @archdata: For arch-specific additions. |
532 | * @of_node: Associated device tree node. | 532 | * @of_node: Associated device tree node. |
533 | * @of_match: Matching of_device_id from driver. | ||
534 | * @devt: For creating the sysfs "dev". | 533 | * @devt: For creating the sysfs "dev". |
535 | * @devres_lock: Spinlock to protect the resource of the device. | 534 | * @devres_lock: Spinlock to protect the resource of the device. |
536 | * @devres_head: The resources list of the device. | 535 | * @devres_head: The resources list of the device. |
@@ -654,13 +653,13 @@ static inline int device_is_registered(struct device *dev) | |||
654 | 653 | ||
655 | static inline void device_enable_async_suspend(struct device *dev) | 654 | static inline void device_enable_async_suspend(struct device *dev) |
656 | { | 655 | { |
657 | if (!dev->power.in_suspend) | 656 | if (!dev->power.is_prepared) |
658 | dev->power.async_suspend = true; | 657 | dev->power.async_suspend = true; |
659 | } | 658 | } |
660 | 659 | ||
661 | static inline void device_disable_async_suspend(struct device *dev) | 660 | static inline void device_disable_async_suspend(struct device *dev) |
662 | { | 661 | { |
663 | if (!dev->power.in_suspend) | 662 | if (!dev->power.is_prepared) |
664 | dev->power.async_suspend = false; | 663 | dev->power.async_suspend = false; |
665 | } | 664 | } |
666 | 665 | ||