1 files changed, 17 insertions, 12 deletions

diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c
index 73ec6796d9e1..c0d5f4a3611d 100644
--- a/drivers/base/power/main.c
+++ b/drivers/base/power/main.c
@@ -1479,6 +1479,22 @@ static int legacy_suspend(struct device *dev, pm_message_t state,
         return error;
 }
 
+static void dpm_propagate_to_parent(struct device *dev)
+{
+        struct device *parent = dev->parent;
+
+        if (!parent)
+                return;
+
+        spin_lock_irq(&parent->power.lock);
+
+        parent->power.direct_complete = false;
+        if (dev->power.wakeup_path && !parent->power.ignore_children)
+                parent->power.wakeup_path = true;
+
+        spin_unlock_irq(&parent->power.lock);
+}
+
 static void dpm_clear_suppliers_direct_complete(struct device *dev)
 {
         struct device_link *link;
@@ -1590,19 +1606,8 @@ static int __device_suspend(struct device *dev, pm_message_t state, bool async)
 
  End:
         if (!error) {
-                struct device *parent = dev->parent;
-
                 dev->power.is_suspended = true;
-                if (parent) {
-                        spin_lock_irq(&parent->power.lock);
-
-                        dev->parent->power.direct_complete = false;
-                        if (dev->power.wakeup_path
-                            && !dev->parent->power.ignore_children)
-                                dev->parent->power.wakeup_path = true;
-
-                        spin_unlock_irq(&parent->power.lock);
-                }
+                dpm_propagate_to_parent(dev);
                 dpm_clear_suppliers_direct_complete(dev);
         }