summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJassi Brar <jaswinder.singh@linaro.org>2012-05-25 18:22:28 +0530
committerAndy Green <andy.green@linaro.org>2012-06-20 12:01:32 +0800
commit5cd694ed31d7f07d419141d44f8f58b344d7fe28 (patch)
tree230c76d26c68ec1230c9ce504cbc3a861aa8452f
parent442fff4b852489f61780e825a7e03666eb1a8ee5 (diff)
Fix wlan irq detection
Signed-off-by: Jassi Brar <jaswinder.singh@linaro.org>
-rw-r--r--drivers/gpio/gpio-omap.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/gpio/gpio-omap.c b/drivers/gpio/gpio-omap.c
index 3abcc6c87c4..00c652c12b1 100644
--- a/drivers/gpio/gpio-omap.c
+++ b/drivers/gpio/gpio-omap.c
@@ -1290,6 +1290,11 @@ static int omap_gpio_runtime_resume(struct device *dev)
__raw_writel(bank->context.risingdetect,
bank->base + bank->regs->risingdetect);
+ if (!bank->workaround_enabled) {
+ spin_unlock_irqrestore(&bank->lock, flags);
+ return 0;
+ }
+
if (bank->get_context_loss_count) {
context_lost_cnt_after =
bank->get_context_loss_count(bank->dev);
@@ -1302,11 +1307,6 @@ static int omap_gpio_runtime_resume(struct device *dev)
}
}
- if (!bank->workaround_enabled) {
- spin_unlock_irqrestore(&bank->lock, flags);
- return 0;
- }
-
l = __raw_readl(bank->base + bank->regs->datain);
/*