diff options
Diffstat (limited to 'drivers/base')
-rw-r--r-- | drivers/base/power/runtime.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/base/power/runtime.c b/drivers/base/power/runtime.c index 637706951885..5a01ecef4af3 100644 --- a/drivers/base/power/runtime.c +++ b/drivers/base/power/runtime.c | |||
@@ -791,12 +791,10 @@ int __pm_runtime_set_status(struct device *dev, unsigned int status) | |||
791 | */ | 791 | */ |
792 | if (!parent->power.disable_depth | 792 | if (!parent->power.disable_depth |
793 | && !parent->power.ignore_children | 793 | && !parent->power.ignore_children |
794 | && parent->power.runtime_status != RPM_ACTIVE) { | 794 | && parent->power.runtime_status != RPM_ACTIVE) |
795 | error = -EBUSY; | 795 | error = -EBUSY; |
796 | } else { | 796 | else if (dev->power.runtime_status == RPM_SUSPENDED) |
797 | if (dev->power.runtime_status == RPM_SUSPENDED) | 797 | atomic_inc(&parent->power.child_count); |
798 | atomic_inc(&parent->power.child_count); | ||
799 | } | ||
800 | 798 | ||
801 | spin_unlock(&parent->power.lock); | 799 | spin_unlock(&parent->power.lock); |
802 | 800 | ||