[PATCH 3.19.y-ckt 062/102] EDAC, ppc4xx: Access mci->csrows array elements properly

Kamal Mostafa kamal at canonical.com
Tue Sep 22 17:51:58 UTC 2015


3.19.8-ckt7 -stable review patch.  If anyone has any objections, please let me know.

------------------

From: Michael Walle <michael at walle.cc>

commit 5c16179b550b9fd8114637a56b153c9768ea06a5 upstream.

The commit

  de3910eb79ac ("edac: change the mem allocation scheme to
		 make Documentation/kobject.txt happy")

changed the memory allocation for the csrows member. But ppc4xx_edac was
forgotten in the patch. Fix it.

Signed-off-by: Michael Walle <michael at walle.cc>
Cc: linux-edac <linux-edac at vger.kernel.org>
Cc: Mauro Carvalho Chehab <mchehab at osg.samsung.com>
Link: http://lkml.kernel.org/r/1437469253-8611-1-git-send-email-michael@walle.cc
Signed-off-by: Borislav Petkov <bp at suse.de>
Signed-off-by: Kamal Mostafa <kamal at canonical.com>
---
 drivers/edac/ppc4xx_edac.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/edac/ppc4xx_edac.c b/drivers/edac/ppc4xx_edac.c
index 1b64fd0..e73d384 100644
--- a/drivers/edac/ppc4xx_edac.c
+++ b/drivers/edac/ppc4xx_edac.c
@@ -920,7 +920,7 @@ static int ppc4xx_edac_init_csrows(struct mem_ctl_info *mci, u32 mcopt1)
 	 */
 
 	for (row = 0; row < mci->nr_csrows; row++) {
-		struct csrow_info *csi = &mci->csrows[row];
+		struct csrow_info *csi = mci->csrows[row];
 
 		/*
 		 * Get the configuration settings for this
-- 
1.9.1





More information about the kernel-team mailing list