summaryrefslogtreecommitdiffstats
path: root/drivers/edac
diff options
context:
space:
mode:
authorYazen Ghannam <Yazen.Ghannam@amd.com>2017-01-13 09:52:19 -0600
committerBorislav Petkov <bp@suse.de>2017-01-16 11:53:39 +0100
commit2287c63643f0f52d9d5452b9dc4079aec0889fe8 (patch)
tree98e63057e5552598a7e189b4da45388436416bab /drivers/edac
parentf5c61277f67f03df334c4486397ecff54968971b (diff)
downloadlinux-stable-2287c63643f0f52d9d5452b9dc4079aec0889fe8.tar.gz
linux-stable-2287c63643f0f52d9d5452b9dc4079aec0889fe8.tar.bz2
linux-stable-2287c63643f0f52d9d5452b9dc4079aec0889fe8.zip
EDAC, amd64: Save and return err code from probe_one_instance()
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. Signed-off-by: Yazen Ghannam <Yazen.Ghannam@amd.com> Cc: linux-edac <linux-edac@vger.kernel.org> Link: http://lkml.kernel.org/r/1484322741-41884-1-git-send-email-Yazen.Ghannam@amd.com Signed-off-by: Borislav Petkov <bp@suse.de>
Diffstat (limited to 'drivers/edac')
-rw-r--r--drivers/edac/amd64_edac.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/edac/amd64_edac.c b/drivers/edac/amd64_edac.c
index 260251177830..4a480da713b9 100644
--- a/drivers/edac/amd64_edac.c
+++ b/drivers/edac/amd64_edac.c
@@ -3466,14 +3466,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();