]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
i7core_edac: fixed typo in error count calculation
authorMathias Krause <minipli@googlemail.com>
Thu, 18 Aug 2011 07:17:00 +0000 (09:17 +0200)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 18 Aug 2011 21:07:15 +0000 (14:07 -0700)
Based on a patch from the PaX Team, found during a clang analysis pass.

Signed-off-by: Mathias Krause <minipli@googlemail.com>
Acked-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Cc: PaX Team <pageexec@freemail.hu>
Cc: stable@kernel.org [v2.6.35+]
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
drivers/edac/i7core_edac.c

index 04f1e7ce02b196868d42253243d79d1044d9b7cc..f6cf448d69b4f468160e19fc29fab0ea473f04b8 100644 (file)
@@ -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;