1 files changed, 11 insertions, 4 deletions

diff --git a/drivers/base/core.c b/drivers/base/core.c
index 36622b52e419..df3e1a44707a 100644
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -236,6 +236,13 @@ struct device_link *device_link_add(struct device *consumer,
                         link->rpm_active = true;
                 }
                 pm_runtime_new_link(consumer);
+                /*
+                 * If the link is being added by the consumer driver at probe
+                 * time, balance the decrementation of the supplier's runtime PM
+                 * usage counter after consumer probe in driver_probe_device().
+                 */
+                if (consumer->links.status == DL_DEV_PROBING)
+                        pm_runtime_get_noresume(supplier);
         }
         get_device(supplier);
         link->supplier = supplier;
@@ -255,12 +262,12 @@ struct device_link *device_link_add(struct device *consumer,
                         switch (consumer->links.status) {
                         case DL_DEV_PROBING:
                                 /*
-                                 * Balance the decrementation of the supplier's
-                                 * runtime PM usage counter after consumer probe
-                                 * in driver_probe_device().
+                                 * Some callers expect the link creation during
+                                 * consumer driver probe to resume the supplier
+                                 * even without DL_FLAG_RPM_ACTIVE.
                                  */
                                 if (flags & DL_FLAG_PM_RUNTIME)
-                                        pm_runtime_get_sync(supplier);
+                                        pm_runtime_resume(supplier);
 
                                 link->status = DL_STATE_CONSUMER_PROBE;
                                 break;