1 files changed, 3 insertions, 11 deletions

diff --git a/drivers/edac/r82600_edac.c b/drivers/edac/r82600_edac.c
index ac1359828e78..787a7652c7ef 100644
--- a/drivers/edac/r82600_edac.c
+++ b/drivers/edac/r82600_edac.c
@@ -219,7 +219,7 @@ static int r82600_probe1(struct pci_dev *pdev, int dev_idx)
         u32 scrub_disabled;
         u32 sdram_refresh_rate;
         u32 row_high_limit_last = 0;
-        u32 eap_init_bits;
+        struct r82600_error_info discard;
 
         debugf0("%s()\n", __func__);
 
@@ -311,8 +311,7 @@ static int r82600_probe1(struct pci_dev *pdev, int dev_idx)
                 row_high_limit_last = row_high_limit;
         }
 
-        /* clear counters */
-        /* FIXME should we? */
+        r82600_get_error_info(mci, &discard);  /* clear counters */
 
         if (edac_mc_add_mc(mci)) {
                 debugf3("%s(): failed edac_mc_add_mc()\n", __func__);
@@ -321,19 +320,12 @@ static int r82600_probe1(struct pci_dev *pdev, int dev_idx)
 
         /* get this far and it's successful */
 
-        /* Clear error flags to allow next error to be reported [p.62] */
-        /* Test systems seem to always have the UE flag raised on boot */
-
-        eap_init_bits = BIT(0) & BIT(1);
         if (disable_hardware_scrub) {
-                eap_init_bits |= BIT(31);
                 debugf3("%s(): Disabling Hardware Scrub (scrub on error)\n",
                         __func__);
+                pci_write_bits32(mci->pdev, R82600_EAP, BIT(31), BIT(31));
         }
 
-        pci_write_bits32(mci->pdev, R82600_EAP, eap_init_bits,
-                         eap_init_bits);
-
         debugf3("%s(): success\n", __func__);
         return 0;