From: Saravana Kannan Date: Sat, 21 Nov 2020 02:02:19 +0000 (-0800) Subject: Revert "driver core: Remove check in driver_deferred_probe_force_trigger()" X-Git-Tag: v5.11-rc1~165^2~28 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=999032ece38be271ca28a6c0ba5f2e4dd4012425;p=thirdparty%2Fkernel%2Flinux.git 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 Link: https://lore.kernel.org/r/20201121020232.908850-5-saravanak@google.com Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/base/dd.c b/drivers/base/dd.c index 001caa0b447cb..b4be35fa7fda6 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