Commit 2331d30d authored Aug 13, 2015 by Linus Torvalds

Merge tag 'edac_fix_for_4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp

Pull EDAC fix from Borislav Petkov:
 "A ppc4xx_edac fix for accessing ->csrows properly.  This driver was
  missed during the conversion a couple of years ago"

* tag 'edac_fix_for_4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp:
  EDAC, ppc4xx: Access mci->csrows array elements properly

parents 30065bfd 5c16179b

drivers/edac/ppc4xx_edac.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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