summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--arch/arm/mach-tegra/suspend.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm/mach-tegra/suspend.c b/arch/arm/mach-tegra/suspend.c
index 146b93a014f3..8a3af04a1689 100644
--- a/arch/arm/mach-tegra/suspend.c
+++ b/arch/arm/mach-tegra/suspend.c
@@ -615,7 +615,8 @@ static int tegra_suspend_enter(suspend_state_t state)
for_each_irq_desc(irq, desc) {
if ((desc->status & IRQ_WAKEUP) &&
- (desc->status & IRQ_SUSPENDED)) {
+ (desc->status & IRQ_SUSPENDED) &&
+ (get_irq_chip(irq)->unmask)) {
get_irq_chip(irq)->unmask(irq);
}
}
@@ -631,7 +632,8 @@ static int tegra_suspend_enter(suspend_state_t state)
for_each_irq_desc(irq, desc) {
if ((desc->status & IRQ_WAKEUP) &&
- (desc->status & IRQ_SUSPENDED)) {
+ (desc->status & IRQ_SUSPENDED) &&
+ (get_irq_chip(irq)->mask)) {
get_irq_chip(irq)->mask(irq);
}
}