From: Dirk Behme <dirk.behme@googlemail.com>
Date: Mon, 20 Feb 2006 22:52:12 +0000 (-0800)
Subject: ARM: OMAP: Support all four OMAP1610 GPIO trigger modes
X-Git-Tag: v2.6.16-omap1~56^2~2
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=3fddca3fc1690b87ccf124c4139f715bb24b9cc2;p=linux-2.6-omap-h63xx.git

ARM: OMAP: Support all four OMAP1610 GPIO trigger modes

(proposed by David Brownell)

Signed-off-by: Dirk Behme <dirk.behme_at_gmail.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
---

diff --git a/arch/arm/plat-omap/gpio.c b/arch/arm/plat-omap/gpio.c
index a4afa1ef1f6..d3c8ea7eecf 100644
--- a/arch/arm/plat-omap/gpio.c
+++ b/arch/arm/plat-omap/gpio.c
@@ -452,10 +452,8 @@ static int _set_gpio_triggering(struct gpio_bank *bank, int gpio, int trigger)
 		l &= ~(3 << (gpio << 1));
 		if (trigger & __IRQT_RISEDGE)
 			l |= 2 << (gpio << 1);
-		else if (trigger & __IRQT_FALEDGE)
+		if (trigger & __IRQT_FALEDGE)
 			l |= 1 << (gpio << 1);
-		else
-			goto bad;
 		break;
 	case METHOD_GPIO_730:
 		reg += OMAP730_GPIO_INT_CONTROL;