diff options
| author | Jérémy Lefaure <jeremy.lefaure@lse.epita.fr> | 2017-03-08 20:18:09 -0500 |
|---|---|---|
| committer | Borislav Petkov <bp@suse.de> | 2017-03-09 09:25:29 +0100 |
| commit | e61555c29c28a4a3b6ba6207f4a0883ee236004d (patch) | |
| tree | e0b294ea0f682cf3ca0a68f3c16e353d04f02466 /drivers | |
| parent | 4bd035eae255a4f1464dca063885fa415e58c12e (diff) | |
| download | linux-stable-e61555c29c28a4a3b6ba6207f4a0883ee236004d.tar.gz linux-stable-e61555c29c28a4a3b6ba6207f4a0883ee236004d.tar.bz2 linux-stable-e61555c29c28a4a3b6ba6207f4a0883ee236004d.zip | |
EDAC, i5000, i5400: Fix use of MTR_DRAM_WIDTH macro
The MTR_DRAM_WIDTH macro returns the data width. It is sometimes used
as if it returned a boolean true if the width if 8. Fix the tests where
MTR_DRAM_WIDTH is misused.
Signed-off-by: Jérémy Lefaure <jeremy.lefaure@lse.epita.fr>
Cc: linux-edac <linux-edac@vger.kernel.org>
Link: http://lkml.kernel.org/r/20170309011809.8340-1-jeremy.lefaure@lse.epita.fr
Signed-off-by: Borislav Petkov <bp@suse.de>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/edac/i5000_edac.c | 2 | ||||
| -rw-r--r-- | drivers/edac/i5400_edac.c | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/drivers/edac/i5000_edac.c b/drivers/edac/i5000_edac.c index 1670d27bcac8..f683919981b0 100644 --- a/drivers/edac/i5000_edac.c +++ b/drivers/edac/i5000_edac.c @@ -1293,7 +1293,7 @@ static int i5000_init_csrows(struct mem_ctl_info *mci) dimm->mtype = MEM_FB_DDR2; /* ask what device type on this row */ - if (MTR_DRAM_WIDTH(mtr)) + if (MTR_DRAM_WIDTH(mtr) == 8) dimm->dtype = DEV_X8; else dimm->dtype = DEV_X4; diff --git a/drivers/edac/i5400_edac.c b/drivers/edac/i5400_edac.c index abf6ef22e220..37a9ba71da44 100644 --- a/drivers/edac/i5400_edac.c +++ b/drivers/edac/i5400_edac.c @@ -1207,13 +1207,14 @@ static int i5400_init_dimms(struct mem_ctl_info *mci) dimm->nr_pages = size_mb << 8; dimm->grain = 8; - dimm->dtype = MTR_DRAM_WIDTH(mtr) ? DEV_X8 : DEV_X4; + dimm->dtype = MTR_DRAM_WIDTH(mtr) == 8 ? + DEV_X8 : DEV_X4; dimm->mtype = MEM_FB_DDR2; /* * The eccc mechanism is SDDC (aka SECC), with * is similar to Chipkill. */ - dimm->edac_mode = MTR_DRAM_WIDTH(mtr) ? + dimm->edac_mode = MTR_DRAM_WIDTH(mtr) == 8 ? EDAC_S8ECD8ED : EDAC_S4ECD4ED; ndimms++; } |