1 files changed, 6 insertions, 1 deletions

diff --git a/drivers/edac/amd64_edac.c b/drivers/edac/amd64_edac.c
index 27246aa8128d..565dc52dbb6f 100644
--- a/drivers/edac/amd64_edac.c
+++ b/drivers/edac/amd64_edac.c
@@ -3336,7 +3336,7 @@ static int probe_one_instance(unsigned int nid)
         ecc_stngs[nid] = s;
 
         if (!ecc_enabled(F3, nid)) {
-                ret = -ENODEV;
+                ret = 0;
 
                 if (!ecc_enable_override)
                         goto err_enable;
@@ -3465,6 +3465,11 @@ static int __init amd64_edac_init(void)
                 }
         }
 
+        if (!edac_has_mcs()) {
+                err = -ENODEV;
+                goto err_pci;
+        }
+
         /* register stuff with EDAC MCE */
         if (report_gart_errors)
                 amd_report_gart_errors(true);