From d920a72ec287f46973680eb929737b4284062eb3 Mon Sep 17 00:00:00 2001
From: viresh kumar <viresh.kumar@st.com>
Date: Thu, 29 Apr 2010 12:22:52 +0100
Subject: [PATCH] --- yaml --- r: 190419 b: refs/heads/master c:
 db7e1bc479cc941c53839b18ff811c7def0c52e7 h: refs/heads/master i:   190417:
 e8e9d50a986ea53b9d68f094ce6bc5f4aa7290bd   190415:
 af67b514dd3727d37c78b40282271c523f59c1c9 v: v3

---
 [refs]                     | 2 +-
 trunk/drivers/gpio/pl061.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 537367f9369a..843b320e0098 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b56ba8aa6f3aeab23d3d4b1190ed1098463b2a9c
+refs/heads/master: db7e1bc479cc941c53839b18ff811c7def0c52e7
diff --git a/trunk/drivers/gpio/pl061.c b/trunk/drivers/gpio/pl061.c
index 2196f318114c..105701a1f05b 100644
--- a/trunk/drivers/gpio/pl061.c
+++ b/trunk/drivers/gpio/pl061.c
@@ -189,7 +189,7 @@ static int pl061_irq_type(unsigned irq, unsigned trigger)
 		gpioibe &= ~(1 << offset);
 		if (trigger & IRQ_TYPE_EDGE_RISING)
 			gpioiev |= 1 << offset;
-		else
+		else if (trigger & IRQ_TYPE_EDGE_FALLING)
 			gpioiev &= ~(1 << offset);
 	}
 	writeb(gpioibe, chip->base + GPIOIBE);