summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2021-12-16 21:44:20 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2021-12-16 21:44:20 +0300
commitfa36bbe6d43f3bbce1f10a187e153587c7584d83 (patch)
treeac4238a5032ed62b709e08742a5da364ee3276bd /arch
parent81eebd540511a5e57ed71a0e6221186513c8841f (diff)
parent9c5d89bc10551f1aecd768b00fca3339a7b8c8ee (diff)
downloadlinux-fa36bbe6d43f3bbce1f10a187e153587c7584d83.tar.xz
Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux
Pull arm64 fix from Catalin Marinas: "Fix missing error code on kexec failure path" * tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux: arm64: kexec: Fix missing error code 'ret' warning in load_other_segments()
Diffstat (limited to 'arch')
-rw-r--r--arch/arm64/kernel/machine_kexec_file.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm64/kernel/machine_kexec_file.c b/arch/arm64/kernel/machine_kexec_file.c
index 63634b4d72c1..59c648d51848 100644
--- a/arch/arm64/kernel/machine_kexec_file.c
+++ b/arch/arm64/kernel/machine_kexec_file.c
@@ -149,6 +149,7 @@ int load_other_segments(struct kimage *image,
initrd_len, cmdline, 0);
if (!dtb) {
pr_err("Preparing for new dtb failed\n");
+ ret = -EINVAL;
goto out_err;
}