Merge tag 'edac_fixes_for_5.2' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp

Pull EDAC fixes from Borislav Petkov:

 - Do not build mpc85_edac as a module (Michael Ellerman)

 - Correct edac_mc_find()'s return value on error (Robert Richter)

* tag 'edac_fixes_for_5.2' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp:
  EDAC/mc: Fix edac_mc_find() in case no device is found
  EDAC/mpc85xx: Prevent building as a module

2 files changed, 6 insertions, 10 deletions

diff --git a/drivers/edac/Kconfig b/drivers/edac/Kconfig
index 47eb4d13ed5f..5e2e0348d460 100644
--- a/drivers/edac/Kconfig
+++ b/drivers/edac/Kconfig
@@ -263,8 +263,8 @@ config EDAC_PND2
           micro-server but may appear on others in the future.
 
 config EDAC_MPC85XX
-        tristate "Freescale MPC83xx / MPC85xx"
-        depends on FSL_SOC
+        bool "Freescale MPC83xx / MPC85xx"
+        depends on FSL_SOC && EDAC=y
         help
           Support for error detection and correction on the Freescale
           MPC8349, MPC8560, MPC8540, MPC8548, T4240
diff --git a/drivers/edac/edac_mc.c b/drivers/edac/edac_mc.c
index 13594ffadcb3..64922c8fa7e3 100644
--- a/drivers/edac/edac_mc.c
+++ b/drivers/edac/edac_mc.c
@@ -679,22 +679,18 @@ static int del_mc_from_global_list(struct mem_ctl_info *mci)
 
 struct mem_ctl_info *edac_mc_find(int idx)
 {
-        struct mem_ctl_info *mci = NULL;
+        struct mem_ctl_info *mci;
         struct list_head *item;
 
         mutex_lock(&mem_ctls_mutex);
 
         list_for_each(item, &mc_devices) {
                 mci = list_entry(item, struct mem_ctl_info, link);
-
-                if (mci->mc_idx >= idx) {
-                        if (mci->mc_idx == idx) {
-                                goto unlock;
-                        }
-                        break;
-                }
+                if (mci->mc_idx == idx)
+                        goto unlock;
         }
 
+        mci = NULL;
 unlock:
         mutex_unlock(&mem_ctls_mutex);
         return mci;