From ddcd01e37d6c4d18b688b01d1496ec11288d87ac Mon Sep 17 00:00:00 2001
From: =?utf8?q?=E5=AE=8B=E7=A7=80=E6=9D=B0?= <sxj@rock-chips.com>
Date: Sun, 19 Sep 2010 23:50:53 -0700
Subject: [PATCH]  using memcpy lead to Array bounds error, fix it

---
 drivers/gpio/expand_gpio_soft_interrupt.c | 14 +++++---------
 drivers/gpio/tca6424.c                    | 10 ++++------
 2 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/drivers/gpio/expand_gpio_soft_interrupt.c b/drivers/gpio/expand_gpio_soft_interrupt.c
index 79c4fd06cfe3..bbf7aa573142 100755
--- a/drivers/gpio/expand_gpio_soft_interrupt.c
+++ b/drivers/gpio/expand_gpio_soft_interrupt.c
@@ -51,12 +51,8 @@ NOTES		:
 #else
 #define DBG(x...)
 #endif
-
-#if 0
 #define DBGERR(x...)	printk(KERN_INFO x)
-#else
-#define DBGERR(x...)
-#endif
+
 
 #define EXTPAND_GPIO_GET_BIT(a,num) (((a)>>(num))&0x01)
 #define EXTPAND_GPIO_SET_BIT(a,num) ((a)|(0x01<<(num)))
@@ -65,7 +61,7 @@ NOTES		:
 
 
 static int expand_gpio_irq_en = -1;
-static int expand_gpio_irq_ctrflag = -1;
+static int expand_gpio_irq_ctrflag = 0;
 static unsigned int expand_gpio_irq_num = 0;
 
 static struct workqueue_struct *irqworkqueue;
@@ -297,7 +293,7 @@ static irqreturn_t expand_gpio_irq_handler(int irq, void * dev_id)
 
 	DBG("******************%s*******************\n",__FUNCTION__);
 	expand_gpio_irq_ctr_dis(pchip->irq_chain,0);
-	memcpy(&oldintputreg[0],&pchip->gvar->reg_input[0],pchip->expand_port_pinnum);
+	memcpy(&oldintputreg[0],&pchip->gvar->reg_input[0],pchip->expand_port_group);
 	if(pchip->irq_data.read_allinputreg(pchip->irq_data.data,&tempintputreg[0]))
 	{
 		expand_gpio_irq_ctr_dis(pchip->irq_chain,-1);
@@ -306,7 +302,7 @@ static irqreturn_t expand_gpio_irq_handler(int irq, void * dev_id)
 		return IRQ_HANDLED;
 	}
 	
-	memcpy(&pchip->gvar->reg_input[0],&tempintputreg[0],pchip->expand_port_pinnum);
+	memcpy(&pchip->gvar->reg_input[0],&tempintputreg[0],pchip->expand_port_group);
 	//DBG("**has run at %s**,input[0] = %x,input[1] = %x,input[2] = %x\n",__FUNCTION__,pchip->gvar.reg_input[0],pchip->gvar.reg_input[1],pchip->gvar.reg_input[2]);
 
 	//Handle for different expand_port_group 
@@ -421,7 +417,7 @@ void expand_gpio_irq_setup(struct expand_gpio_soft_int *pchip)
 int wait_untill_input_reg_flash(void)
 {
 	unsigned int num = 0;
-    unsigned int tempnum = expand_gpio_irq_num;
+    	unsigned int tempnum = expand_gpio_irq_num;
 
 	while(expand_gpio_irq_ctrflag&&(expand_gpio_irq_num==tempnum))
 	{
diff --git a/drivers/gpio/tca6424.c b/drivers/gpio/tca6424.c
index e3edd35f1f3b..06e2ab9843db 100755
--- a/drivers/gpio/tca6424.c
+++ b/drivers/gpio/tca6424.c
@@ -46,17 +46,12 @@ NOTES		:
 #include "../drivers/gpio/expand_gpio_soft_interrupt.h"
 
 #if 0
-#define TCA6424DEB
 #define DBG(x...)	printk(KERN_INFO x)
 #else
 #define DBG(x...)
 #endif
-
-#if 0
 #define DBGERR(x...)	printk(KERN_INFO x)
-#else
-#define DBGERR(x...)
-#endif
+
 
 struct tca6424_chip {
 	
@@ -296,7 +291,10 @@ static int tca6424_gpio_get_value(struct gpio_chip *gc, unsigned pin_num)
 	#ifdef CONFIG_EXPAND_GPIO_SOFT_INTERRUPT
 	ret = wait_untill_input_reg_flash( );
 	if(ret<0)
+	{
 		return -1;
+		DBGERR("**********tca6424 get value error***************\n");
+	}
 	#endif
 	
 	gpioPortNum = pin_num/8;
-- 
2.34.1