From bc38b2ca0a3c318f4a4c08dafe4f69fd899898b3 Mon Sep 17 00:00:00 2001 From: Tarun Kanti DebBarma Date: Mon, 5 Mar 2012 16:00:54 +0530 Subject: [PATCH] --- yaml --- r: 296933 b: refs/heads/master c: 960edffe29dfd845ee532ee51398592cba96d701 h: refs/heads/master i: 296931: b60d4e6778200137d1ea85df1f7fc4743be5aca8 v: v3 --- [refs] | 2 +- trunk/drivers/gpio/gpio-omap.c | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index a6b3746f2d33..5221880c683c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2c836f7ea5e7b5eec2a798e02b1d76ea791fa094 +refs/heads/master: 960edffe29dfd845ee532ee51398592cba96d701 diff --git a/trunk/drivers/gpio/gpio-omap.c b/trunk/drivers/gpio/gpio-omap.c index bbe964899017..bcb1061dbd6d 100644 --- a/trunk/drivers/gpio/gpio-omap.c +++ b/trunk/drivers/gpio/gpio-omap.c @@ -1247,9 +1247,6 @@ static int omap_gpio_runtime_suspend(struct device *dev) * non-wakeup GPIOs. Otherwise spurious IRQs will be * generated. See OMAP2420 Errata item 1.101. */ - if (!(bank->enabled_non_wakeup_gpios)) - goto update_gpio_context_count; - bank->saved_datain = __raw_readl(bank->base + bank->regs->datain); l1 = __raw_readl(bank->base + bank->regs->fallingdetect); @@ -1298,7 +1295,7 @@ static int omap_gpio_runtime_resume(struct device *dev) __raw_writel(bank->context.risingdetect, bank->base + bank->regs->risingdetect); - if (!bank->enabled_non_wakeup_gpios || !bank->workaround_enabled) { + if (!bank->workaround_enabled) { spin_unlock_irqrestore(&bank->lock, flags); return 0; }