---

yaml --- r: 336213 b: refs/heads/master c: 24bef66 h: refs/heads/master i: 336211: 3cc9c2d v: v3
git-mirror · Oct 25, 2012 · dddc1e5 · dddc1e5
1 parent 1afabf9
commit dddc1e5
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 479696840239e0cc43efb3c917bdcad2174d2215
+refs/heads/master: 24bef66e74d647aebd34e0bef7693512b7912029
diff --git a/trunk/drivers/edac/edac_mc.c b/trunk/drivers/edac/edac_mc.c
@@ -416,10 +416,18 @@ struct mem_ctl_info *edac_mc_alloc(unsigned mc_num,
 		dimm->cschannel = chn;
 
 		/* Increment csrow location */
-		row++;
-		if (row == tot_csrows) {
-			row = 0;
+		if (layers[0].is_virt_csrow) {
 			chn++;
+			if (chn == tot_channels) {
+				chn = 0;
+				row++;
+			}
+		} else {
+			row++;
+			if (row == tot_csrows) {
+				row = 0;
+				chn++;
+			}
 		}
 
 		/* Increment dimm location */