---

yaml --- r: 336535 b: refs/heads/master c: 3c06227 h: refs/heads/master i: 336533: f254290 336531: 8ea2b9a 336527: 32bb55f v: v3
git-mirror · Nov 28, 2012 · e93ec89 · e93ec89
1 parent 6b27fab
commit e93ec89
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 16a528ee3975c860dc93fbfc718fe9aa25ed92bc
+refs/heads/master: 3c0622760aaa4731e2fd3a7472a96b59d2caecc4
diff --git a/trunk/drivers/edac/edac_mc_sysfs.c b/trunk/drivers/edac/edac_mc_sysfs.c
@@ -781,10 +781,14 @@ static ssize_t mci_size_mb_show(struct device *dev,
 	for (csrow_idx = 0; csrow_idx < mci->nr_csrows; csrow_idx++) {
 		struct csrow_info *csrow = mci->csrows[csrow_idx];
 
-		for (j = 0; j < csrow->nr_channels; j++) {
-			struct dimm_info *dimm = csrow->channels[j]->dimm;
-
-			total_pages += dimm->nr_pages;
+		if (csrow->mci->csbased) {
+			total_pages += csrow->nr_pages;
+		} else {
+			for (j = 0; j < csrow->nr_channels; j++) {
+				struct dimm_info *dimm = csrow->channels[j]->dimm;
+
+				total_pages += dimm->nr_pages;
+			}
 		}
 	}