From 217b68133e2f4043f52e87ee5386121406aad823 Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Wed, 28 Mar 2012 20:13:36 -0300
Subject: [PATCH] --- yaml --- r: 309135 b: refs/heads/master c:
 36683aab90373afd0cff0935bf886ebe6c7b0de6 h: refs/heads/master i:   309133:
 3a7992ce6ced8066828ee78511565b4b5b89cc6e   309131:
 433a731070348f0d0ea78d736af32455b54c0e40   309127:
 ff3b8e88ae62b4f48bee7e82abde3cc4af0d1ebd   309119:
 a3827c8855f144b14e1de5e43b512fbfe9f457e0 v: v3

---
 [refs]                            | 2 +-
 trunk/drivers/edac/i82975x_edac.c | 9 +++------
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 65dcebf2f46e..49324ecffbb3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 805afb6997ce45093981f27afbe4e21ccde3d990
+refs/heads/master: 36683aab90373afd0cff0935bf886ebe6c7b0de6
diff --git a/trunk/drivers/edac/i82975x_edac.c b/trunk/drivers/edac/i82975x_edac.c
index 9c346d7f707f..433332c7cdba 100644
--- a/trunk/drivers/edac/i82975x_edac.c
+++ b/trunk/drivers/edac/i82975x_edac.c
@@ -410,6 +410,9 @@ static void i82975x_init_csrows(struct mem_ctl_info *mci,
 			cumul_size);
 
 		nr_pages = cumul_size - last_cumul_size;
+		if (!nr_pages)
+			continue;
+
 		/*
 		 * Initialise dram labels
 		 * index values:
@@ -420,9 +423,6 @@ static void i82975x_init_csrows(struct mem_ctl_info *mci,
 		for (chan = 0; chan < csrow->nr_channels; chan++) {
 			dimm = mci->csrows[index].channels[chan].dimm;
 
-			if (!nr_pages)
-				continue;
-
 			dimm->nr_pages = nr_pages / csrow->nr_channels;
 			strncpy(csrow->channels[chan].dimm->label,
 					labels[(index >> 1) + (chan * 2)],
@@ -433,9 +433,6 @@ static void i82975x_init_csrows(struct mem_ctl_info *mci,
 			dimm->edac_mode = EDAC_SECDED; /* only supported */
 		}
 
-		if (!nr_pages)
-			continue;	/* not populated */
-
 		csrow->first_page = last_cumul_size;
 		csrow->last_page = cumul_size - 1;
 		last_cumul_size = cumul_size;