diff options
| author | Haojian Zhuang <haojian.zhuang@marvell.com> | 2012-02-06 15:33:22 +0800 |
|---|---|---|
| committer | Haojian Zhuang <haojian.zhuang@marvell.com> | 2012-02-16 10:28:53 +0800 |
| commit | bc329ad7b018c8f6725cb025bf4d192925db84e6 (patch) | |
| tree | 3d3f21c5bc464f48f13beedc6617880428e50288 /arch/arm/mach-pxa/spitz_pm.c | |
| parent | c38e23456278e967f094b08247ffc3711b1029b2 (diff) | |
| download | blackbird-op-linux-bc329ad7b018c8f6725cb025bf4d192925db84e6.tar.gz blackbird-op-linux-bc329ad7b018c8f6725cb025bf4d192925db84e6.zip | |
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>
Diffstat (limited to 'arch/arm/mach-pxa/spitz_pm.c')
| -rw-r--r-- | arch/arm/mach-pxa/spitz_pm.c | 5 |
1 files changed, 2 insertions, 3 deletions
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; } |
