Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394...

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

diff --git a/drivers/edac/i82875p_edac.c b/drivers/edac/i82875p_edac.c
index c9aed70fec8eab98ba03bf626cc713018cb9183a..031abadc439a37c407d213fd1091b8e9a03b745e 100644 (file)
--- a/drivers/edac/i82875p_edac.c
+++ b/drivers/edac/i82875p_edac.c
@@ -177,7 +177,7 @@ static const struct i82875p_dev_info i82875p_devs[] = {
                .ctl_name = "i82875p"},
 };
 
-static struct pci_dev *mci_pdev = NULL;        /* init dev: in case that AGP code has
+static struct pci_dev *mci_pdev;       /* init dev: in case that AGP code has
                                         * already registered driver
                                         */
 
@@ -198,27 +198,28 @@ static void i82875p_get_error_info(struct mem_ctl_info *mci,
         * overwritten by UE.
         */
        pci_read_config_word(pdev, I82875P_ERRSTS, &info->errsts);
+
+       if (!(info->errsts & 0x0081))
+               return;
+
        pci_read_config_dword(pdev, I82875P_EAP, &info->eap);
        pci_read_config_byte(pdev, I82875P_DES, &info->des);
        pci_read_config_byte(pdev, I82875P_DERRSYN, &info->derrsyn);
        pci_read_config_word(pdev, I82875P_ERRSTS, &info->errsts2);
 
-       pci_write_bits16(pdev, I82875P_ERRSTS, 0x0081, 0x0081);
-
        /*
         * If the error is the same then we can for both reads then
         * the first set of reads is valid.  If there is a change then
         * there is a CE no info and the second set of reads is valid
         * and should be UE info.
         */
-       if (!(info->errsts2 & 0x0081))
-               return;
-
        if ((info->errsts ^ info->errsts2) & 0x0081) {
                pci_read_config_dword(pdev, I82875P_EAP, &info->eap);
                pci_read_config_byte(pdev, I82875P_DES, &info->des);
                pci_read_config_byte(pdev, I82875P_DERRSYN, &info->derrsyn);
        }
+
+       pci_write_bits16(pdev, I82875P_ERRSTS, 0x0081, 0x0081);
 }
 
 static int i82875p_process_error_info(struct mem_ctl_info *mci,
@@ -229,7 +230,7 @@ static int i82875p_process_error_info(struct mem_ctl_info *mci,
 
        multi_chan = mci->csrows[0].nr_channels - 1;
 
-       if (!(info->errsts2 & 0x0081))
+       if (!(info->errsts & 0x0081))
                return 0;
 
        if (!handle_errors)
@@ -269,6 +270,7 @@ static int i82875p_setup_overfl_dev(struct pci_dev *pdev,
 {
        struct pci_dev *dev;
        void __iomem *window;
+       int err;
 
        *ovrfl_pdev = NULL;
        *ovrfl_window = NULL;
@@ -286,7 +288,12 @@ static int i82875p_setup_overfl_dev(struct pci_dev *pdev,
                if (dev == NULL)
                        return 1;
 
-               pci_bus_add_device(dev);
+               err = pci_bus_add_device(dev);
+               if (err) {
+                       i82875p_printk(KERN_ERR,
+                               "%s(): pci_bus_add_device() Failed\n",
+                               __func__);
+               }
        }
 
        *ovrfl_pdev = dev;
@@ -393,7 +400,7 @@ static int i82875p_probe1(struct pci_dev *pdev, int dev_idx)
        drc = readl(ovrfl_window + I82875P_DRC);
        nr_chans = dual_channel_active(drc) + 1;
        mci = edac_mc_alloc(sizeof(*pvt), I82875P_NR_CSROWS(nr_chans),
-                       nr_chans);
+                       nr_chans, 0);
 
        if (!mci) {
                rc = -ENOMEM;
@@ -421,7 +428,7 @@ static int i82875p_probe1(struct pci_dev *pdev, int dev_idx)
        /* Here we assume that we will never see multiple instances of this
         * type of memory controller.  The ID is therefore hardcoded to 0.
         */
-       if (edac_mc_add_mc(mci, 0)) {
+       if (edac_mc_add_mc(mci)) {
                debugf3("%s(): failed edac_mc_add_mc()\n", __func__);
                goto fail1;
        }