| From foo@baz Thu Nov 9 09:48:01 CET 2017 |
| From: Yazen Ghannam <Yazen.Ghannam@amd.com> |
| Date: Fri, 13 Jan 2017 09:52:19 -0600 |
| Subject: EDAC, amd64: Save and return err code from probe_one_instance() |
| |
| From: Yazen Ghannam <Yazen.Ghannam@amd.com> |
| |
| |
| [ 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. |
| |
| 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> |
| Signed-off-by: Sasha Levin <alexander.levin@verizon.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| drivers/edac/amd64_edac.c | 6 ++++-- |
| 1 file changed, 4 insertions(+), 2 deletions(-) |
| |
| --- a/drivers/edac/amd64_edac.c |
| +++ b/drivers/edac/amd64_edac.c |
| @@ -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(); |
| |