[PATCH] EDAC: protect memory controller list

- Fix code so we always hold mem_ctls_mutex while we are stepping
  through the list of mem_ctl_info structures.  Otherwise bad things
  may happen if one task is stepping through the list while another
  task is modifying it.  We may eventually want to use reference
  counting to manage the mem_ctl_info structures.  In the meantime we
  may as well fix this bug.

- Don't disable interrupts while we are walking the list of
  mem_ctl_info structures in check_mc_devices().  This is unnecessary.

Signed-off-by: David S. Peterson <dsp@llnl.gov>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 6 insertions, 6 deletions

diff --git a/drivers/edac/e7xxx_edac.c b/drivers/edac/e7xxx_edac.c
index 8b0da35ae47c..9b59c661f45e 100644
--- a/drivers/edac/e7xxx_edac.c
+++ b/drivers/edac/e7xxx_edac.c
@@ -510,12 +510,12 @@ static void __devexit e7xxx_remove_one(struct pci_dev *pdev)
 
         debugf0("%s()\n", __func__);
 
-        if (((mci = edac_mc_find_mci_by_pdev(pdev)) != 0) &&
-            !edac_mc_del_mc(mci)) {
-                pvt = (struct e7xxx_pvt *) mci->pvt_info;
-                pci_dev_put(pvt->bridge_ck);
-                edac_mc_free(mci);
-        }
+        if ((mci = edac_mc_del_mc(pdev)) == NULL)
+                return;
+
+        pvt = (struct e7xxx_pvt *) mci->pvt_info;
+        pci_dev_put(pvt->bridge_ck);
+        edac_mc_free(mci);
 }