From be09216377a8f5a3abf8eb1726b1652f6b61a701 Mon Sep 17 00:00:00 2001 From: Guennadi Liakhovetski Date: Wed, 28 Jun 2006 16:42:02 +0100 Subject: [PATCH] --- yaml --- r: 31021 b: refs/heads/master c: e033108bf7e585755350b554048229d1fd10a02e h: refs/heads/master i: 31019: 8230c583bf39b881ecbfb42eeefd7a483cea699e v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-pxa/irq.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 2bccb16f781f..9e39ee62c814 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 87c01737b1ccf821b93f74a26a0dc991dba16d19 +refs/heads/master: e033108bf7e585755350b554048229d1fd10a02e diff --git a/trunk/arch/arm/mach-pxa/irq.c b/trunk/arch/arm/mach-pxa/irq.c index 539b596005fc..d9635ff4b10c 100644 --- a/trunk/arch/arm/mach-pxa/irq.c +++ b/trunk/arch/arm/mach-pxa/irq.c @@ -88,8 +88,8 @@ static int pxa_gpio_irq_type(unsigned int irq, unsigned int type) if (type == IRQT_PROBE) { /* Don't mess with enabled GPIOs using preconfigured edges or - GPIOs set to alternate function during probe */ - if ((GPIO_IRQ_rising_edge[idx] | GPIO_IRQ_falling_edge[idx]) & + GPIOs set to alternate function or to output during probe */ + if ((GPIO_IRQ_rising_edge[idx] | GPIO_IRQ_falling_edge[idx] | GPDR(gpio)) & GPIO_bit(gpio)) return 0; if (GAFR(gpio) & (0x3 << (((gpio) & 0xf)*2)))