diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-01-15 14:52:44 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-01-15 14:52:44 -0800 |
commit | bf0c346b3fbfb7315c5773767f3c7210fdeacce0 (patch) | |
tree | c431ec864986f81b5849a5f15b2a0b81dee0c3fb /drivers | |
parent | 3b3ef30833cc85982b0b7e950998d86f5e2d28cf (diff) | |
parent | 926311fd7dabcd284a1e8a87a3e2bb5f929c0c60 (diff) | |
download | linux-bf0c346b3fbfb7315c5773767f3c7210fdeacce0.tar.gz linux-bf0c346b3fbfb7315c5773767f3c7210fdeacce0.tar.bz2 linux-bf0c346b3fbfb7315c5773767f3c7210fdeacce0.zip |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp:
amd64_edac: Ensure index stays within bounds in amd64_get_scrub_rate
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/edac/amd64_edac.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/edac/amd64_edac.c b/drivers/edac/amd64_edac.c index c5facd951dda..000dc67b85b7 100644 --- a/drivers/edac/amd64_edac.c +++ b/drivers/edac/amd64_edac.c @@ -197,7 +197,7 @@ static int amd64_get_scrub_rate(struct mem_ctl_info *mci, u32 *bw) edac_printk(KERN_DEBUG, EDAC_MC, "pci-read, sdram scrub control value: %d \n", scrubval); - for (i = 0; ARRAY_SIZE(scrubrates); i++) { + for (i = 0; i < ARRAY_SIZE(scrubrates); i++) { if (scrubrates[i].scrubval == scrubval) { *bw = scrubrates[i].bandwidth; status = 0; |