From: Haojian Zhuang <haojian.zhuang@marvell.com>
Date: Mon, 6 Feb 2012 07:33:22 +0000 (+0800)
Subject: ARM: pxa: fix wrong parsing gpio event on spitz
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=bc329ad7b018c8f6725cb025bf4d192925db84e6;p=linux-beck.git

ARM: pxa: fix wrong parsing gpio event on spitz

(~GPLR0 & GPIO_bit(SPITZ_GPIO_KEY_INT)) | (GPLR0 &
GPIO_bit(SPITZ_GPIO_SYNC));

After using gpio_get_value, the statement should be in below.
((!gpio_get_value(SPITZ_GPIO_KEY_INT)
	<< GPIO_bit(SPITZ_GPIO_KEY_INT))
	| gpio_get_value(SPITZ_GPIO_SYNC));

Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com>
---

diff --git a/arch/arm/mach-pxa/spitz_pm.c b/arch/arm/mach-pxa/spitz_pm.c
index 34cbdac51525..438f02fe122a 100644
--- a/arch/arm/mach-pxa/spitz_pm.c
+++ b/arch/arm/mach-pxa/spitz_pm.c
@@ -172,10 +172,9 @@ static int spitz_should_wakeup(unsigned int resume_on_alarm)
 static unsigned long spitz_charger_wakeup(void)
 {
 	unsigned long ret;
-	ret = (!gpio_get_value(SPITZ_GPIO_KEY_INT)
+	ret = ((!gpio_get_value(SPITZ_GPIO_KEY_INT)
 		<< GPIO_bit(SPITZ_GPIO_KEY_INT))
-		| (!gpio_get_value(SPITZ_GPIO_SYNC)
-		<< GPIO_bit(SPITZ_GPIO_SYNC));
+		| gpio_get_value(SPITZ_GPIO_SYNC));
 	return ret;
 }