leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'for_3.5/fixes/gpio-2' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into gpio/next

Browse Source
This commit is contained in:
Grant Likely 2012-05-18 16:50:01 -06:00
commit adf11b62f3
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/gpio/gpio-omap.c
View File

@ -1157,9 +1157,6 @@ static int omap_gpio_runtime_suspend(struct device *dev)
spin_lock_irqsave(&bank->lock, flags); spin_lock_irqsave(&bank->lock, flags);
if (!bank->enabled_non_wakeup_gpios)
goto update_gpio_context_count;
/* /*
* Only edges can generate a wakeup event to the PRCM. * Only edges can generate a wakeup event to the PRCM.
* *
@ -1180,6 +1177,9 @@ static int omap_gpio_runtime_suspend(struct device *dev)
__raw_writel(wake_hi | bank->context.risingdetect, __raw_writel(wake_hi | bank->context.risingdetect,
bank->base + bank->regs->risingdetect); bank->base + bank->regs->risingdetect);
if (!bank->enabled_non_wakeup_gpios)
goto update_gpio_context_count;
if (bank->power_mode != OFF_MODE) { if (bank->power_mode != OFF_MODE) {
bank->power_mode = 0; bank->power_mode = 0;
goto update_gpio_context_count; goto update_gpio_context_count;
@ -1238,8 +1238,7 @@ static int omap_gpio_runtime_resume(struct device *dev)
if (bank->get_context_loss_count) { if (bank->get_context_loss_count) {
context_lost_cnt_after = context_lost_cnt_after =
bank->get_context_loss_count(bank->dev); bank->get_context_loss_count(bank->dev);
if (context_lost_cnt_after != bank->context_loss_count || if (context_lost_cnt_after != bank->context_loss_count) {
!context_lost_cnt_after) {
omap_gpio_restore_context(bank); omap_gpio_restore_context(bank);
} else { } else {
spin_unlock_irqrestore(&bank->lock, flags); spin_unlock_irqrestore(&bank->lock, flags);