Skip to contentSkip to conversation

i7core_edac: fix misuse of logical operation in place of bitop

PATCH New David Sterba 1 participant 1 message Dec 27, 2010

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 i7core_edac: fix misuse of logical operation in place of bitop

CC Mauro Carvalho Chehab <[email protected]>
---
 drivers/edac/i7core_edac.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
drivers/edac/i7core_edac.c +2 -2
index 362861c..f41a34e 100644
@@ -731,7 +731,7 @@ static int get_dimm_config(const struct mem_ctl_info *mci)
 			debugf1("\t\t%#x\t%#x\t%#x\n",
 				(value[j] >> 27) & 0x1,
 				(value[j] >> 24) & 0x7,
-				(value[j] && ((1 << 24) - 1)));
+				(value[j] & ((1 << 24) - 1)));
 	}
 
 	return 0;
@@ -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;
Signature · 1 line
1.7.3.4.578.g6068a