diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-10-18 09:29:27 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-10-18 09:29:27 +0200 |
| commit | 22d4f9beaf32a7cda9edeafdf5e99bec3de32c51 (patch) | |
| tree | 37fd192452ba853e740d4b8c3fa0f171dc2b8d33 /drivers/firmware/efi/runtime-wrappers.c | |
| parent | nvmem: imx-ocotp: add support for post processing (diff) | |
| parent | Linux 5.15-rc6 (diff) | |
| download | linux-22d4f9beaf32a7cda9edeafdf5e99bec3de32c51.tar.xz linux-22d4f9beaf32a7cda9edeafdf5e99bec3de32c51.zip | |
Merge 5.15-rc6 into char-misc-next
We need the char/misc fixes in here for merging and testing.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/firmware/efi/runtime-wrappers.c')
| -rw-r--r-- | drivers/firmware/efi/runtime-wrappers.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/firmware/efi/runtime-wrappers.c b/drivers/firmware/efi/runtime-wrappers.c index 1410beaef5c3..f3e54f6616f0 100644 --- a/drivers/firmware/efi/runtime-wrappers.c +++ b/drivers/firmware/efi/runtime-wrappers.c @@ -414,7 +414,7 @@ static void virt_efi_reset_system(int reset_type, unsigned long data_size, efi_char16_t *data) { - if (down_interruptible(&efi_runtime_lock)) { + if (down_trylock(&efi_runtime_lock)) { pr_warn("failed to invoke the reset_system() runtime service:\n" "could not get exclusive access to the firmware\n"); return; |