diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-04-10 09:24:35 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-04-10 09:24:35 -0700 |
| commit | d5fa1dad75bef69fbff5a193b7a99ada624a0154 (patch) | |
| tree | eca7a32d86ae8c1a0d374aa9fee550ba49148019 | |
| parent | 445e09e79743c8ba01f1e9eb6b10faab5a92a5c7 (diff) | |
| parent | eed6e41813deb9ee622cd9242341f21430d7789f (diff) | |
| download | linux-d5fa1dad75bef69fbff5a193b7a99ada624a0154.tar.gz linux-d5fa1dad75bef69fbff5a193b7a99ada624a0154.tar.bz2 linux-d5fa1dad75bef69fbff5a193b7a99ada624a0154.zip | |
Merge tag 'driver-core-5.12-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
Pull driver core fix from Greg KH:
"Here is a single driver core fix for 5.12-rc7 to resolve a reported
problem that caused some devices to lockup when booting. It has been
in linux-next with no reported issues"
* tag 'driver-core-5.12-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core:
driver core: Fix locking bug in deferred_probe_timeout_work_func()
| -rw-r--r-- | drivers/base/dd.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/base/dd.c b/drivers/base/dd.c index e2cf3b29123e..37a5e5f8b221 100644 --- a/drivers/base/dd.c +++ b/drivers/base/dd.c @@ -292,14 +292,16 @@ int driver_deferred_probe_check_state(struct device *dev) static void deferred_probe_timeout_work_func(struct work_struct *work) { - struct device_private *private, *p; + struct device_private *p; driver_deferred_probe_timeout = 0; driver_deferred_probe_trigger(); flush_work(&deferred_probe_work); - list_for_each_entry_safe(private, p, &deferred_probe_pending_list, deferred_probe) - dev_info(private->device, "deferred probe pending\n"); + mutex_lock(&deferred_probe_mutex); + list_for_each_entry(p, &deferred_probe_pending_list, deferred_probe) + dev_info(p->device, "deferred probe pending\n"); + mutex_unlock(&deferred_probe_mutex); wake_up_all(&probe_timeout_waitqueue); } static DECLARE_DELAYED_WORK(deferred_probe_timeout_work, deferred_probe_timeout_work_func); |