[PATCH 5/9] x86/microcode: Propagate save_microcode_in_initrd() retval

[Borislav Petkov]

From: Borislav Petkov <b...@suse.de>

Will be used in a later patch. No functionality change.

Signed-off-by: Borislav Petkov <b...@suse.de>
---
 arch/x86/kernel/cpu/microcode/core.c  | 6 +++---
 arch/x86/kernel/cpu/microcode/intel.c | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/arch/x86/kernel/cpu/microcode/core.c 
b/arch/x86/kernel/cpu/microcode/core.c
index 12823b6ebd6d..9ae7fcac70ab 100644
--- a/arch/x86/kernel/cpu/microcode/core.c
+++ b/arch/x86/kernel/cpu/microcode/core.c
@@ -182,17 +182,17 @@ static int __init save_microcode_in_initrd(void)
        switch (c->x86_vendor) {
        case X86_VENDOR_INTEL:
                if (c->x86 >= 6)
-                       save_microcode_in_initrd_intel();
+                       return save_microcode_in_initrd_intel();
                break;
        case X86_VENDOR_AMD:
                if (c->x86 >= 0x10)
-                       save_microcode_in_initrd_amd();
+                       return save_microcode_in_initrd_amd();
                break;
        default:
                break;
        }
 
-       return 0;
+       return -EINVAL;
 }
 
 void reload_early_microcode(void)
diff --git a/arch/x86/kernel/cpu/microcode/intel.c 
b/arch/x86/kernel/cpu/microcode/intel.c
index 2ad40b73c8df..d852ca984f87 100644
--- a/arch/x86/kernel/cpu/microcode/intel.c
+++ b/arch/x86/kernel/cpu/microcode/intel.c
@@ -675,8 +675,8 @@ int __init save_microcode_in_initrd_intel(void)
        ret = save_microcode(&mc_saved_data, mc_saved, count);
        if (ret)
                pr_err("Cannot save microcode patches from initrd.\n");
-
-       show_saved_mc();
+       else
+               show_saved_mc();
 
        return ret;
 }
-- 
2.7.3