[PATCH] EDAC: protect memory controller list

[linux-2.6] / drivers / edac / i82860_edac.c

diff --git a/drivers/edac/i82860_edac.c b/drivers/edac/i82860_edac.c
index fa9ab84fa5c96e5b233f84b634fdccb4c01a2686..688854260a0e72bde108a73717bbd39b0e4f9865 100644 (file)
--- a/drivers/edac/i82860_edac.c
+++ b/drivers/edac/i82860_edac.c
@@ -62,8 +62,6 @@ static const struct i82860_dev_info i82860_devs[] = {
 static struct pci_dev *mci_pdev = NULL;        /* init dev: in case that AGP code
                                           has already registered driver */
 
-static int i82860_registered = 1;
-
 static void i82860_get_error_info (struct mem_ctl_info *mci,
                struct i82860_error_info *info)
 {
@@ -136,6 +134,7 @@ static int i82860_probe1(struct pci_dev *pdev, int dev_idx)
        int index;
        struct mem_ctl_info *mci = NULL;
        unsigned long last_cumul_size;
+       struct i82860_error_info discard;
 
        u16 mchcfg_ddim;        /* DRAM Data Integrity Mode 0=none,2=edac */
 
@@ -162,7 +161,7 @@ static int i82860_probe1(struct pci_dev *pdev, int dev_idx)
        mci->edac_cap = EDAC_FLAG_SECDED;
        /* adjust FLAGS */
 
-       mci->mod_name = BS_MOD_STR;
+       mci->mod_name = EDAC_MOD_STR;
        mci->mod_ver = "$Revision: 1.1.2.6 $";
        mci->ctl_name = i82860_devs[dev_idx].ctl_name;
        mci->edac_check = i82860_check;
@@ -202,8 +201,7 @@ static int i82860_probe1(struct pci_dev *pdev, int dev_idx)
                csrow->edac_mode = mchcfg_ddim ? EDAC_SECDED : EDAC_NONE;
        }
 
-       /* clear counters */
-       pci_write_bits16(mci->pdev, I82860_ERRSTS, 0x0003, 0x0003);
+       i82860_get_error_info(mci, &discard);  /* clear counters */
 
        if (edac_mc_add_mc(mci)) {
                debugf3("%s(): failed edac_mc_add_mc()\n", __func__);
@@ -239,9 +237,10 @@ static void __devexit i82860_remove_one(struct pci_dev *pdev)
 
        debugf0("%s()\n", __func__);
 
-       mci = edac_mc_find_mci_by_pdev(pdev);
-       if ((mci != NULL) && (edac_mc_del_mc(mci) == 0))
-               edac_mc_free(mci);
+       if ((mci = edac_mc_del_mc(pdev)) == NULL)
+               return;
+
+       edac_mc_free(mci);
 }
 
 static const struct pci_device_id i82860_pci_tbl[] __devinitdata = {
@@ -253,7 +252,7 @@ static const struct pci_device_id i82860_pci_tbl[] __devinitdata = {
 MODULE_DEVICE_TABLE(pci, i82860_pci_tbl);
 
 static struct pci_driver i82860_driver = {
-       .name = BS_MOD_STR,
+       .name = EDAC_MOD_STR,
        .probe = i82860_init_one,
        .remove = __devexit_p(i82860_remove_one),
        .id_table = i82860_pci_tbl,
@@ -265,24 +264,33 @@ static int __init i82860_init(void)
 
        debugf3("%s()\n", __func__);
        if ((pci_rc = pci_register_driver(&i82860_driver)) < 0)
-               return pci_rc;
+               goto fail0;
 
        if (!mci_pdev) {
-               i82860_registered = 0;
                mci_pdev = pci_get_device(PCI_VENDOR_ID_INTEL,
                                          PCI_DEVICE_ID_INTEL_82860_0, NULL);
                if (mci_pdev == NULL) {
                        debugf0("860 pci_get_device fail\n");
-                       return -ENODEV;
+                       pci_rc = -ENODEV;
+                       goto fail1;
                }
                pci_rc = i82860_init_one(mci_pdev, i82860_pci_tbl);
                if (pci_rc < 0) {
                        debugf0("860 init fail\n");
-                       pci_dev_put(mci_pdev);
-                       return -ENODEV;
+                       pci_rc = -ENODEV;
+                       goto fail1;
                }
        }
        return 0;
+
+fail1:
+       pci_unregister_driver(&i82860_driver);
+
+fail0:
+       if (mci_pdev != NULL)
+               pci_dev_put(mci_pdev);
+
+       return pci_rc;
 }
 
 static void __exit i82860_exit(void)
@@ -290,10 +298,9 @@ static void __exit i82860_exit(void)
        debugf3("%s()\n", __func__);
 
        pci_unregister_driver(&i82860_driver);
-       if (!i82860_registered) {
-               i82860_remove_one(mci_pdev);
+
+       if (mci_pdev != NULL)
                pci_dev_put(mci_pdev);
-       }
 }
 
 module_init(i82860_init);
@@ -301,5 +308,5 @@ module_exit(i82860_exit);
 
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR
-    ("Red Hat Inc. (http://www.redhat.com.com) Ben Woodard <woodard@redhat.com>");
+    ("Red Hat Inc. (http://www.redhat.com) Ben Woodard <woodard@redhat.com>");
 MODULE_DESCRIPTION("ECC support for Intel 82860 memory hub controllers");