Revert "FROMLIST: PM / sleep: don't suspend parent when async child suspend_{noirq...
authorHuang, Tao <huangtao@rock-chips.com>
Fri, 2 Dec 2016 11:53:55 +0000 (19:53 +0800)
committerHuang, Tao <huangtao@rock-chips.com>
Fri, 2 Dec 2016 11:53:55 +0000 (19:53 +0800)
This reverts commit 11b2dcefd88e8ae01a11c6df55d91206ac226c52.
Fixed by 04c0800c73b2 ("PM / sleep: don't suspend parent when
async child suspend_{noirq, late} fails").

drivers/base/power/main.c

index 982f586e9290b5acd65c713b9a5742e785bfd863..d388edadfb6ad6fcdce33ea5d615c40528c33846 100644 (file)
@@ -1038,9 +1038,6 @@ static int __device_suspend_noirq(struct device *dev, pm_message_t state, bool a
 
        dpm_wait_for_children(dev, async);
 
-       if (async_error)
-               goto Complete;
-
        if (dev->pm_domain) {
                info = "noirq power domain ";
                callback = pm_noirq_op(&dev->pm_domain->ops, state);
@@ -1188,9 +1185,6 @@ static int __device_suspend_late(struct device *dev, pm_message_t state, bool as
 
        dpm_wait_for_children(dev, async);
 
-       if (async_error)
-               goto Complete;
-
        if (dev->pm_domain) {
                info = "late power domain ";
                callback = pm_late_early_op(&dev->pm_domain->ops, state);