1 files changed, 5 insertions, 4 deletions

diff --git a/drivers/gpio/gpio-omap.c b/drivers/gpio/gpio-omap.c
index f6b2c51b2935..41265e823b23 100644
--- a/drivers/gpio/gpio-omap.c
+++ b/drivers/gpio/gpio-omap.c
@@ -1352,10 +1352,6 @@ void omap2_gpio_resume_after_idle(void)
 #if defined(CONFIG_PM_RUNTIME)
 static void omap_gpio_restore_context(struct gpio_bank *bank)
 {
-        __raw_writel(bank->context.irqenable1,
-                                bank->base + bank->regs->irqenable);
-        __raw_writel(bank->context.irqenable2,
-                                bank->base + bank->regs->irqenable2);
         __raw_writel(bank->context.wake_en,
                                 bank->base + bank->regs->wkup_en);
         __raw_writel(bank->context.ctrl, bank->base + bank->regs->ctrl);
@@ -1375,6 +1371,11 @@ static void omap_gpio_restore_context(struct gpio_bank *bank)
                 __raw_writel(bank->context.debounce_en,
                                         bank->base + bank->regs->debounce_en);
         }
+
+        __raw_writel(bank->context.irqenable1,
+                                bank->base + bank->regs->irqenable);
+        __raw_writel(bank->context.irqenable2,
+                                bank->base + bank->regs->irqenable2);
 }
 #endif /* CONFIG_PM_RUNTIME */
 #else