summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVernon Mauery <vernux@us.ibm.com>2010-04-16 19:40:19 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-05-18 12:43:23 -0300
commit8a311e179e52d122ac203d8e88014284c18ca8ab (patch)
tree8320e9f28bdbe9abb02664e9df35c8714f9898ee
parent2a6fae326713ec84f307c045f6b497d4afaeb1d4 (diff)
Always call i7core_[ur]dimm_check_mc_ecc_err
This fixes an error in function i7core_check_error In commit ca9c90ba09ca3c9799319f46a56f397afbf617c2 which converts the driver to use double buffering, there is a change in the logic. Before, if mce_count was zero, it skipped over a couple of statements and finished out with a call to the *check_mc_ecc_err function. The current code checks to see if mce_count is 0 and then exits. This change reverts the behavior back to the original where if there are no errors to report, we skip to the end and call the *check_mc_ecc_err function. This fix allows the driver to work again on my Nehalem based blades again. Signed-off-by: Vernon Mauery <vernux@us.ibm.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--drivers/edac/i7core_edac.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/edac/i7core_edac.c b/drivers/edac/i7core_edac.c
index 8e93df637bca..cd51709c4d89 100644
--- a/drivers/edac/i7core_edac.c
+++ b/drivers/edac/i7core_edac.c
@@ -1670,7 +1670,7 @@ static void i7core_check_error(struct mem_ctl_info *mci)
count = (pvt->mce_out + MCE_LOG_LEN - pvt->mce_in)
% MCE_LOG_LEN;
if (!count)
- return;
+ goto check_ce_error;
m = pvt->mce_outentry;
if (pvt->mce_in + count > MCE_LOG_LEN) {
@@ -1703,6 +1703,7 @@ static void i7core_check_error(struct mem_ctl_info *mci)
/*
* Now, let's increment CE error counts
*/
+check_ce_error:
if (!pvt->is_registered)
i7core_udimm_check_mc_ecc_err(mci);
else