---

yaml --- r: 296932 b: refs/heads/master c: 2c836f7 h: refs/heads/master v: v3
git-mirror · Mar 20, 2012 · f289d8f · f289d8f
1 parent b60d4e6
commit f289d8f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git 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
@@ -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);
 }