diff options
author | Axel Lin <axel.lin@ingics.com> | 2012-11-19 21:34:56 -0500 |
---|---|---|
committer | Samuel Ortiz <sameo@linux.intel.com> | 2012-11-26 06:10:51 -0500 |
commit | 3f9be35bd9090eaa2f68ed9b24efdbf3abcf4b28 (patch) | |
tree | b2a5647e0f05fb5415f315a24700d12ccfa9b2ff | |
parent | 302b95621dc96651187c21fd66e5a44860e4c3b1 (diff) |
mfd: rc5t583: Fix array subscript is above array bounds
I got below build warning while compiling this driver.
It's obviously RC5T583_MAX_INTERRUPT_MASK_REGS is 9 but irq_en_add
array only has 8 elements.
CC drivers/mfd/rc5t583-irq.o
drivers/mfd/rc5t583-irq.c: In function 'rc5t583_irq_sync_unlock':
drivers/mfd/rc5t583-irq.c:227: warning: array subscript is above array bounds
drivers/mfd/rc5t583-irq.c: In function 'rc5t583_irq_init':
drivers/mfd/rc5t583-irq.c:349: warning: array subscript is above array bounds
Since the number of interrupt enable registers is 8, this patch adds
define for RC5T583_MAX_INTERRUPT_EN_REGS to fix this bug.
Signed-off-by: Axel Lin <axel.lin@ingics.com>
Acked-by: Laxman Dewangan <ldewangan@nvidia.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
-rw-r--r-- | drivers/mfd/rc5t583-irq.c | 2 | ||||
-rw-r--r-- | include/linux/mfd/rc5t583.h | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/drivers/mfd/rc5t583-irq.c b/drivers/mfd/rc5t583-irq.c index fe00cdd6f83d..b41db5968706 100644 --- a/drivers/mfd/rc5t583-irq.c +++ b/drivers/mfd/rc5t583-irq.c | |||
@@ -345,7 +345,7 @@ int rc5t583_irq_init(struct rc5t583 *rc5t583, int irq, int irq_base) | |||
345 | mutex_init(&rc5t583->irq_lock); | 345 | mutex_init(&rc5t583->irq_lock); |
346 | 346 | ||
347 | /* Initailize all int register to 0 */ | 347 | /* Initailize all int register to 0 */ |
348 | for (i = 0; i < RC5T583_MAX_INTERRUPT_MASK_REGS; i++) { | 348 | for (i = 0; i < RC5T583_MAX_INTERRUPT_EN_REGS; i++) { |
349 | ret = rc5t583_write(rc5t583->dev, irq_en_add[i], | 349 | ret = rc5t583_write(rc5t583->dev, irq_en_add[i], |
350 | rc5t583->irq_en_reg[i]); | 350 | rc5t583->irq_en_reg[i]); |
351 | if (ret < 0) | 351 | if (ret < 0) |
diff --git a/include/linux/mfd/rc5t583.h b/include/linux/mfd/rc5t583.h index 36c242e52ef1..fd413ccab915 100644 --- a/include/linux/mfd/rc5t583.h +++ b/include/linux/mfd/rc5t583.h | |||
@@ -33,6 +33,7 @@ | |||
33 | /* Maximum number of main interrupts */ | 33 | /* Maximum number of main interrupts */ |
34 | #define MAX_MAIN_INTERRUPT 5 | 34 | #define MAX_MAIN_INTERRUPT 5 |
35 | #define RC5T583_MAX_GPEDGE_REG 2 | 35 | #define RC5T583_MAX_GPEDGE_REG 2 |
36 | #define RC5T583_MAX_INTERRUPT_EN_REGS 8 | ||
36 | #define RC5T583_MAX_INTERRUPT_MASK_REGS 9 | 37 | #define RC5T583_MAX_INTERRUPT_MASK_REGS 9 |
37 | 38 | ||
38 | /* Interrupt enable register */ | 39 | /* Interrupt enable register */ |
@@ -304,7 +305,7 @@ struct rc5t583 { | |||
304 | uint8_t intc_inten_reg; | 305 | uint8_t intc_inten_reg; |
305 | 306 | ||
306 | /* For group interrupt bits and address */ | 307 | /* For group interrupt bits and address */ |
307 | uint8_t irq_en_reg[RC5T583_MAX_INTERRUPT_MASK_REGS]; | 308 | uint8_t irq_en_reg[RC5T583_MAX_INTERRUPT_EN_REGS]; |
308 | 309 | ||
309 | /* For gpio edge */ | 310 | /* For gpio edge */ |
310 | uint8_t gpedge_reg[RC5T583_MAX_GPEDGE_REG]; | 311 | uint8_t gpedge_reg[RC5T583_MAX_GPEDGE_REG]; |