From 88b1043815f06d70ab6ebb83dcda68cb4caafc19 Mon Sep 17 00:00:00 2001
From: Tamas Vincze <tom@vincze.org>
Date: Fri, 15 Jan 2010 17:01:10 -0800
Subject: [PATCH] --- yaml --- r: 179343 b: refs/heads/master c:
 118f3e1afd5534c15f9701f33514186cfc841a27 h: refs/heads/master i:   179341:
 27e0f8347b08a3ae9a9886ec9c965a6426bb9064   179339:
 c1930fc590ed51265179ad7e53dd39f8e92ae9b6   179335:
 3c4e05f5eecdfbe36797e8c03e34af6eb186d291   179327:
 a979254a0b66640478ac181b9f236478f7d1e297 v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/edac/i5000_edac.c | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 0f98203cb478..66405e3832f2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 355e8e8d1b0779fccb6ca1351fb73c71985e22b2
+refs/heads/master: 118f3e1afd5534c15f9701f33514186cfc841a27
diff --git a/trunk/drivers/edac/i5000_edac.c b/trunk/drivers/edac/i5000_edac.c
index 77a9579d7167..adc10a2ac5f6 100644
--- a/trunk/drivers/edac/i5000_edac.c
+++ b/trunk/drivers/edac/i5000_edac.c
@@ -577,7 +577,13 @@ static void i5000_process_nonfatal_error_info(struct mem_ctl_info *mci,
 		debugf0("\tUncorrected bits= 0x%x\n", ue_errors);
 
 		branch = EXTRACT_FBDCHAN_INDX(info->ferr_nf_fbd);
-		channel = branch;
+
+		/*
+		 * According with i5000 datasheet, bit 28 has no significance
+		 * for errors M4Err-M12Err and M17Err-M21Err, on FERR_NF_FBD
+		 */
+		channel = branch & 2;
+
 		bank = NREC_BANK(info->nrecmema);
 		rank = NREC_RANK(info->nrecmema);
 		rdwr = NREC_RDWR(info->nrecmema);