From e91ad0eeeb41e41c43561cb016013f872d8f70e4 Mon Sep 17 00:00:00 2001 From: Keith Mannthey Date: Mon, 26 Oct 2009 16:50:11 -0700 Subject: [PATCH] --- yaml --- r: 167759 b: refs/heads/master c: c2494ace990c5d37cfe66911b85d28e6945eadfc h: refs/heads/master i: 167757: 1865725c85dda737ed35d7f3ef7f75e40de78c5f 167755: 013baf32f07ad2253656883a5d3ccea245288a56 167751: 96c21f51d2843e583a4ac848997ed7dbba9f3ded 167743: 17ce7af670353029d2c2f3c478a550f43d2701a0 v: v3 --- [refs] | 2 +- trunk/drivers/edac/i5000_edac.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 0d74ec7fd58e..f76331018252 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0616fb003d4f799c4be62275242fc7ff9a968f84 +refs/heads/master: c2494ace990c5d37cfe66911b85d28e6945eadfc diff --git a/trunk/drivers/edac/i5000_edac.c b/trunk/drivers/edac/i5000_edac.c index d335086f4a26..77a9579d7167 100644 --- a/trunk/drivers/edac/i5000_edac.c +++ b/trunk/drivers/edac/i5000_edac.c @@ -1173,7 +1173,7 @@ static void i5000_get_mc_regs(struct mem_ctl_info *mci) pci_read_config_word(pvt->branch_1, where, &pvt->b1_mtr[slot_row]); debugf2("MTR%d where=0x%x B1 value=0x%x\n", slot_row, - where, pvt->b0_mtr[slot_row]); + where, pvt->b1_mtr[slot_row]); } else { pvt->b1_mtr[slot_row] = 0; } @@ -1232,7 +1232,7 @@ static int i5000_init_csrows(struct mem_ctl_info *mci) struct csrow_info *p_csrow; int empty, channel_count; int max_csrows; - int mtr; + int mtr, mtr1; int csrow_megs; int channel; int csrow; @@ -1251,9 +1251,10 @@ static int i5000_init_csrows(struct mem_ctl_info *mci) /* use branch 0 for the basis */ mtr = pvt->b0_mtr[csrow >> 1]; + mtr1 = pvt->b1_mtr[csrow >> 1]; /* if no DIMMS on this row, continue */ - if (!MTR_DIMMS_PRESENT(mtr)) + if (!MTR_DIMMS_PRESENT(mtr) && !MTR_DIMMS_PRESENT(mtr1)) continue; /* FAKE OUT VALUES, FIXME */