From: Tony Lindgren <tony@atomide.com>
Date: Wed, 8 Feb 2006 09:07:58 +0000 (-0800)
Subject: ARM: OMAP: Fix one more gpio SA_TRIGGER_* issue
X-Git-Tag: v2.6.16-omap1~99
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=e5c71cecb90fc8a3aaa3daf48787936a2ab87563;p=linux-2.6-omap-h63xx.git

ARM: OMAP: Fix one more gpio SA_TRIGGER_* issue

Avoid other SA_TRIGGER_* flags triggering BUG()
---

diff --git a/arch/arm/plat-omap/gpio.c b/arch/arm/plat-omap/gpio.c
index c1d6243c3be..861f5536ff6 100644
--- a/arch/arm/plat-omap/gpio.c
+++ b/arch/arm/plat-omap/gpio.c
@@ -446,7 +446,7 @@ static int _set_gpio_triggering(struct gpio_bank *bank, int gpio, int trigger)
 			reg += OMAP1610_GPIO_EDGE_CTRL1;
 		gpio &= 0x07;
 		/* We allow only edge triggering, i.e. two lowest bits */
-		if (trigger & ~IRQT_BOTHEDGE)
+		if (trigger & (__IRQT_LOWLVL | __IRQT_HIGHLVL))
 			BUG();
 		l = __raw_readl(reg);
 		l &= ~(3 << (gpio << 1));