[tip:,x86/microcode] x86/microcode/core: Return an error only when necessary

Message ID 167568840420.4906.17934418820483240527.tip-bot2@tip-bot2
State New
Headers
Series [tip:,x86/microcode] x86/microcode/core: Return an error only when necessary |

Commit Message

tip-bot2 for Thomas Gleixner Feb. 6, 2023, 1 p.m. UTC
  The following commit has been merged into the x86/microcode branch of tip:

Commit-ID:     f33e0c893b22bf94d7985f1f2aa3872237560c74
Gitweb:        https://git.kernel.org/tip/f33e0c893b22bf94d7985f1f2aa3872237560c74
Author:        Borislav Petkov (AMD) <bp@alien8.de>
AuthorDate:    Mon, 30 Jan 2023 13:48:04 +01:00
Committer:     Borislav Petkov (AMD) <bp@alien8.de>
CommitterDate: Mon, 06 Feb 2023 13:41:31 +01:00

x86/microcode/core: Return an error only when necessary

Return an error from the late loading function which is run on each CPU
only when an error has actually been encountered during the update.

Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de>
Link: https://lore.kernel.org/r/20230130161709.11615-5-bp@alien8.de
---
 arch/x86/kernel/cpu/microcode/core.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
  

Patch

diff --git a/arch/x86/kernel/cpu/microcode/core.c b/arch/x86/kernel/cpu/microcode/core.c
index ddc0958..7a329e5 100644
--- a/arch/x86/kernel/cpu/microcode/core.c
+++ b/arch/x86/kernel/cpu/microcode/core.c
@@ -409,10 +409,10 @@  static int __reload_late(void *info)
 		goto wait_for_siblings;
 
 	if (err >= UCODE_NFOUND) {
-		if (err == UCODE_ERROR)
+		if (err == UCODE_ERROR) {
 			pr_warn("Error reloading microcode on CPU %d\n", cpu);
-
-		ret = -1;
+			ret = -1;
+		}
 	}
 
 wait_for_siblings: