summaryrefslogtreecommitdiffstats
path: root/drivers/base/dd.c
diff options
context:
space:
mode:
authorSaravana Kannan <saravanak@google.com>2020-11-21 03:02:19 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-12-09 19:10:20 +0100
commit999032ece38be271ca28a6c0ba5f2e4dd4012425 (patch)
tree3c4401c4ee1c4019ac8ce760e824f24f3ee6a3bd /drivers/base/dd.c
parentRevert "driver core: Don't do deferred probe in parallel with kernel_init thr... (diff)
downloadlinux-999032ece38be271ca28a6c0ba5f2e4dd4012425.tar.xz
linux-999032ece38be271ca28a6c0ba5f2e4dd4012425.zip
Revert "driver core: Remove check in driver_deferred_probe_force_trigger()"
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> Link: https://lore.kernel.org/r/20201121020232.908850-5-saravanak@google.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/base/dd.c')
-rw-r--r--drivers/base/dd.c3
1 files changed, 3 insertions, 0 deletions
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