diff options
| author | Mukesh Ojha <[email protected]> | 2023-10-26 14:27:38 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <[email protected]> | 2023-10-27 11:30:38 +0000 |
| commit | 87ffa98eeee8d62a56afdad80ea697e7a6e5c354 (patch) | |
| tree | 6fe0fc0acac43f7b77a226b79729996a7ce497ab /drivers/base/firmware_loader/main.c | |
| parent | Documentation: security-bugs.rst: linux-distros relaxed their rules (diff) | |
| download | kernel-87ffa98eeee8d62a56afdad80ea697e7a6e5c354.tar.gz kernel-87ffa98eeee8d62a56afdad80ea697e7a6e5c354.zip | |
firmware_loader: Refactor kill_pending_fw_fallback_reqs()
Rename 'only_kill_custom' and refactor logic related to it
to be more meaningful.
Signed-off-by: Mukesh Ojha <[email protected]>
Acked-by: Luis Chamberlain <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Greg Kroah-Hartman <[email protected]>
Diffstat (limited to 'drivers/base/firmware_loader/main.c')
| -rw-r--r-- | drivers/base/firmware_loader/main.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/base/firmware_loader/main.c b/drivers/base/firmware_loader/main.c index b58c42f1b1ce..522ccee781b4 100644 --- a/drivers/base/firmware_loader/main.c +++ b/drivers/base/firmware_loader/main.c @@ -1524,10 +1524,10 @@ static int fw_pm_notify(struct notifier_block *notify_block, case PM_SUSPEND_PREPARE: case PM_RESTORE_PREPARE: /* - * kill pending fallback requests with a custom fallback - * to avoid stalling suspend. + * Here, kill pending fallback requests will only kill + * non-uevent firmware request to avoid stalling suspend. */ - kill_pending_fw_fallback_reqs(true); + kill_pending_fw_fallback_reqs(false); device_cache_fw_images(); break; @@ -1612,7 +1612,7 @@ static int fw_shutdown_notify(struct notifier_block *unused1, * Kill all pending fallback requests to avoid both stalling shutdown, * and avoid a deadlock with the usermode_lock. */ - kill_pending_fw_fallback_reqs(false); + kill_pending_fw_fallback_reqs(true); return NOTIFY_DONE; } |