aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-08-13 10:22:11 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2015-08-13 10:22:11 -0700
commit2331d30dc8c121c0f350a27fda9e9154b8d3c178 (patch)
treee1b1b09b600ce595fbf166c8be406abbd46def75
parent30065bfda900a844d9c88bc4d5d298025a4fef5e (diff)
parent5c16179b550b9fd8114637a56b153c9768ea06a5 (diff)
downloadlinux-yocto-2331d30dc8c121c0f350a27fda9e9154b8d3c178.tar.gz
linux-yocto-2331d30dc8c121c0f350a27fda9e9154b8d3c178.tar.bz2
linux-yocto-2331d30dc8c121c0f350a27fda9e9154b8d3c178.zip
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
-rw-r--r--drivers/edac/ppc4xx_edac.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/edac/ppc4xx_edac.c b/drivers/edac/ppc4xx_edac.c
index 3515b381c131..711d8ad74f11 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