From e725c9da78520c63b4831838ec6c552f3ef63cc5 Mon Sep 17 00:00:00 2001
From: Mika Westerberg <ext-mika.1.westerberg@nokia.com>
Date: Wed, 29 Dec 2010 13:01:31 +0200
Subject: [PATCH] --- yaml --- r: 231104 b: refs/heads/master c:
 f7c5cc456211da7d0b0aefd3886e57b313a0e00f h: refs/heads/master v: v3

---
 [refs]                          | 2 +-
 trunk/arch/arm/plat-omap/gpio.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index d6b7283c8c0e..57dd37e896c7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dda0aea7ba5a902982cb65a7f7ec1b5c8e7b6923
+refs/heads/master: f7c5cc456211da7d0b0aefd3886e57b313a0e00f
diff --git a/trunk/arch/arm/plat-omap/gpio.c b/trunk/arch/arm/plat-omap/gpio.c
index 1f98e0b94847..60631f227797 100644
--- a/trunk/arch/arm/plat-omap/gpio.c
+++ b/trunk/arch/arm/plat-omap/gpio.c
@@ -718,7 +718,7 @@ static int _set_gpio_triggering(struct gpio_bank *bank, int gpio, int trigger)
 	case METHOD_GPIO_24XX:
 	case METHOD_GPIO_44XX:
 		set_24xx_gpio_triggering(bank, gpio, trigger);
-		break;
+		return 0;
 #endif
 	default:
 		goto bad;