1 files changed, 6 insertions, 1 deletions

diff --git a/drivers/gpio/gpio-omap.c b/drivers/gpio/gpio-omap.c
index e0fd2e4b2b9c..f49bd6f47a50 100644
--- a/drivers/gpio/gpio-omap.c
+++ b/drivers/gpio/gpio-omap.c
@@ -1363,7 +1363,12 @@ static void omap_gpio_restore_context(struct gpio_bank *bank)
                                 bank->base + bank->regs->risingdetect);
         __raw_writel(bank->context.fallingdetect,
                                 bank->base + bank->regs->fallingdetect);
-        __raw_writel(bank->context.dataout, bank->base + bank->regs->dataout);
+        if (bank->regs->set_dataout && bank->regs->clr_dataout)
+                __raw_writel(bank->context.dataout,
+                                bank->base + bank->regs->set_dataout);
+        else
+                __raw_writel(bank->context.dataout,
+                                bank->base + bank->regs->dataout);
         __raw_writel(bank->context.oe, bank->base + bank->regs->direction);
 
         if (bank->dbck_enable_mask) {