From b00684e4f8db18cf69367ee4a648338232c8de97 Mon Sep 17 00:00:00 2001 From: Borislav Petkov Date: Tue, 3 Aug 2010 16:51:28 +0200 Subject: [PATCH] --- yaml --- r: 202564 b: refs/heads/master c: 962b70a1eb22c467b95756a290c694e73da17f41 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/edac/amd64_edac.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index e95577f63d65..afbab22a13fe 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: eba042a81edd6baaff44831b2d719b14a6d21e58 +refs/heads/master: 962b70a1eb22c467b95756a290c694e73da17f41 diff --git a/trunk/drivers/edac/amd64_edac.c b/trunk/drivers/edac/amd64_edac.c index 0106d343a681..c29d24fe1856 100644 --- a/trunk/drivers/edac/amd64_edac.c +++ b/trunk/drivers/edac/amd64_edac.c @@ -1683,7 +1683,7 @@ static void f10_map_sysaddr_to_csrow(struct mem_ctl_info *mci, * ganged. Otherwise @chan should already contain the channel at * this point. */ - if (dct_ganging_enabled(pvt) && pvt->nbcfg & K8_NBCFG_CHIPKILL) + if (dct_ganging_enabled(pvt) && (pvt->nbcfg & K8_NBCFG_CHIPKILL)) chan = get_channel_from_ecc_syndrome(mci, syndrome); if (chan >= 0)