---

yaml --- r: 263075 b: refs/heads/master c: 8cf2d23 h: refs/heads/master i: 263073: 645e0e8 263071: b0823e7 v: v3
git-mirror · Aug 18, 2011 · 49f6366 · 49f6366
1 parent 214970d
commit 49f6366
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 338d0f0a6fbc82407864606f5b64b75aeb3c70f2
+refs/heads/master: 8cf2d2399ab60842f55598bc1b00fd15503b9950
diff --git a/trunk/drivers/edac/i7core_edac.c b/trunk/drivers/edac/i7core_edac.c
@@ -1670,7 +1670,7 @@ static void i7core_mce_output_error(struct mem_ctl_info *mci,
 	char *type, *optype, *err, *msg;
 	unsigned long error = m->status & 0x1ff0000l;
 	u32 optypenum = (m->status >> 4) & 0x07;
-	u32 core_err_cnt = (m->status >> 38) && 0x7fff;
+	u32 core_err_cnt = (m->status >> 38) & 0x7fff;
 	u32 dimm = (m->misc >> 16) & 0x3;
 	u32 channel = (m->misc >> 18) & 0x3;
 	u32 syndrome = m->misc >> 32;