[PATCH v2 04/17] Revert "driver core: Remove check in driver_deferred_probe_force_trigger()"

Saravana Kannan
2020-11-21T02:04:01Z

This reverts commit fefcfc968723caf93318613a08e1f3ad07a6154f.

The reverted commit is fixing commit 716a7a259690 ("driver core:
fw_devlink: Add support for batching fwnode parsing"). Since the
original commit will be reverted, the fix can be reverted too.

Signed-off-by: Saravana Kannan <saravanak@google.com>
---
drivers/base/dd.c | 3 +++
1 file changed, 3 insertions(+)

diff --git a/drivers/base/dd.c b/drivers/base/dd.c
index 001caa0b447c..b4be35fa7fda 100644
--- a/drivers/base/dd.c
+++ b/drivers/base/dd.c
@@ -172,6 +172,9 @@ static void driver_deferred_probe_trigger(void)

void driver_deferred_probe_force_trigger(void)
{
+ if (!driver_deferred_probe_enable)
+ return;
+
/*
* A successful probe means that all the devices in the pending list
* should be triggered to be reprobed. Move all the deferred devices
--
2.29.2.454.gaff20da3a2-goog