Skip to contentSkip to conversation

Patch "EDAC, amd64: Save and return err code from probe_one_instance()" has been added to the 4.9-stable tree

PATCH Greg Kroah-Hartman 1 participant 1 message Nov 9, 2017

Subsystems (3)
lore
Share & tools
lore

Greg Kroah-Hartman

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

EDAC, amd64: Save and return err code from probe_one_instance()

to the 4.9-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
edac-amd64-save-and-return-err-code-from-probe_one_instance.patch
and it can be found in the queue-4.9 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

From foo@baz Thu Nov 9 09:48:01 CET 2017
From: Yazen Ghannam <[email protected]>
Date: Fri, 13 Jan 2017 09:52:19 -0600
Subject: EDAC, amd64: Save and return err code from probe_one_instance()

From: Yazen Ghannam <[email protected]>

[ Upstream commit 2287c63643f0f52d9d5452b9dc4079aec0889fe8 ]

We should save the return code from probe_one_instance() so that it can be returned from the module init function. Otherwise, we'll be returning the -ENOMEM from above.

---
 drivers/edac/amd64_edac.c |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

Patches currently in stable-queue which might be from [email protected] are

queue-4.9/edac-amd64-add-x86cpuid-sanity-check-during-init.patch queue-4.9/edac-amd64-save-and-return-err-code-from-probe_one_instance.patch --
To unsubscribe from this list: send the line "unsubscribe linux-edac" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

drivers/edac/amd64_edac.c +4 -2
@@ -3001,14 +3001,16 @@ static int __init amd64_edac_init(void)
 	if (!msrs)
 		goto err_free;
 
-	for (i = 0; i < amd_nb_num(); i++)
-		if (probe_one_instance(i)) {
+	for (i = 0; i < amd_nb_num(); i++) {
+		err = probe_one_instance(i);
+		if (err) {
 			/* unwind properly */
 			while (--i >= 0)
 				remove_one_instance(i);
 
 			goto err_pci;
 		}
+	}
 
 	setup_pci_device();