From f289d8f15f2c4f5195273bdd8777045759bc1ed7 Mon Sep 17 00:00:00 2001
From: Tarun Kanti DebBarma <tarun.kanti@ti.com>
Date: Fri, 2 Mar 2012 12:52:52 +0530
Subject: [PATCH] --- yaml --- r: 296932 b: refs/heads/master c:
 2c836f7ea5e7b5eec2a798e02b1d76ea791fa094 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 77caef892854..a6b3746f2d33 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8276536cec38bc6bde30d0aa67716f22b9b9705a
+refs/heads/master: 2c836f7ea5e7b5eec2a798e02b1d76ea791fa094
diff --git a/trunk/drivers/gpio/gpio-omap.c b/trunk/drivers/gpio/gpio-omap.c
index 8901d576cb7d..bbe964899017 100644
--- a/trunk/drivers/gpio/gpio-omap.c
+++ b/trunk/drivers/gpio/gpio-omap.c
@@ -120,10 +120,13 @@ static void _set_gpio_dataout_reg(struct gpio_bank *bank, int gpio, int enable)
 	void __iomem *reg = bank->base;
 	u32 l = GPIO_BIT(bank, gpio);
 
-	if (enable)
+	if (enable) {
 		reg += bank->regs->set_dataout;
-	else
+		bank->context.dataout |= l;
+	} else {
 		reg += bank->regs->clr_dataout;
+		bank->context.dataout &= ~l;
+	}
 
 	__raw_writel(l, reg);
 }