From: Dave Gerlach <d-gerlach@xxxxxx> Commit 2dc983c565e0 ("gpio/omap: cleanup prepare_for_idle and resume_after_idle") introduces omap2_gpio_prepare_for_idle and omap2_gpio_resume_after_idle to properly configure gpios that are used as wake sources. When entering off mode, omap2_gpio_prepare_for_idle can set a flag indicating off-mode entry is desired, however once this flag is set it is never cleared, so any additional calls to this function, regardless of the mode, have this flag set. This patch restores the pwr_mode flag to 0 in omap2_gpio_resume_after_idle to ensure the flag is not misconfigured during non off-mode operation. Signed-off-by: Dave Gerlach <d-gerlach@xxxxxx> Signed-off-by: Keerthy <j-keerthy@xxxxxx> --- drivers/gpio/gpio-omap.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/gpio/gpio-omap.c b/drivers/gpio/gpio-omap.c index 34fde30..84d664b 100644 --- a/drivers/gpio/gpio-omap.c +++ b/drivers/gpio/gpio-omap.c @@ -1476,6 +1476,8 @@ void omap2_gpio_resume_after_idle(void) continue; pm_runtime_get_sync(bank->chip.parent); + + bank->power_mode = 0; } } #endif -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html