From b85a8605e7e2e66a3ccea5da3ba6c8499effd2b2 Mon Sep 17 00:00:00 2001 From: Saravana Kannan Date: Sun, 17 May 2020 10:34:53 -0700 Subject: [PATCH] FROMGIT: driver core: Remove check in driver_deferred_probe_force_trigger() The whole point behind adding driver_deferred_probe_force_trigger() in commit 716a7a259690 ("driver core: fw_devlink: Add support for batching fwnode parsing") was to skip the check for driver_deferred_probe_enable. Otherwise, it's identical to driver_deferred_probe_trigger(). Delete the check in driver_deferred_probe_force_trigger() so that fw_devlink_pause() and fw_devlink_resume() can kick off deferred probe as intended. Without doing this forced deferred probe trigger, some platforms seem to be crashing during boot because they assume probe order of devices. Fixes: 716a7a259690 ("driver core: fw_devlink: Add support for batching fwnode parsing") Signed-off-by: Saravana Kannan Link: https://lore.kernel.org/r/20200517173453.157703-1-saravanak@google.com Signed-off-by: Greg Kroah-Hartman (cherry picked from commit fefcfc968723caf93318613a08e1f3ad07a6154f https: //git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git driver-core-next) Bug: 157691602 Signed-off-by: Saravana Kannan Change-Id: I2c1378ec24c0b5f257d0c9bbac066ad156dcbafb --- drivers/base/dd.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/drivers/base/dd.c b/drivers/base/dd.c index 14065ebb610a..95f66d043272 100644 --- a/drivers/base/dd.c +++ b/drivers/base/dd.c @@ -165,9 +165,6 @@ 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