diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2012-05-04 17:56:16 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2012-05-04 23:38:50 +0200 |
| commit | 9c6079aa1bfcf7e14de10b824779ce39b679bcb8 (patch) | |
| tree | 4d2dd86804abbb95b12abe811cb2095ce7758349 /kernel/irq/pm.c | |
| parent | d4dc0f90d243fb54cfbca6601c9a7c5a758e437f (diff) | |
| download | op-kernel-dev-9c6079aa1bfcf7e14de10b824779ce39b679bcb8.zip op-kernel-dev-9c6079aa1bfcf7e14de10b824779ce39b679bcb8.tar.gz | |
genirq: Do not consider disabled wakeup irqs
If an wakeup interrupt has been disabled before the suspend code
disables all interrupts then we have to ignore the pending flag.
Otherwise we would abort suspend over and over as nothing clears the
pending flag because the interrupt is disabled.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: NeilBrown <neilb@suse.de>
Diffstat (limited to 'kernel/irq/pm.c')
| -rw-r--r-- | kernel/irq/pm.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/kernel/irq/pm.c b/kernel/irq/pm.c index 15e53b1..cb228bf 100644 --- a/kernel/irq/pm.c +++ b/kernel/irq/pm.c @@ -103,8 +103,13 @@ int check_wakeup_irqs(void) int irq; for_each_irq_desc(irq, desc) { + /* + * Only interrupts which are marked as wakeup source + * and have not been disabled before the suspend check + * can abort suspend. + */ if (irqd_is_wakeup_set(&desc->irq_data)) { - if (desc->istate & IRQS_PENDING) + if (desc->depth == 1 && desc->istate & IRQS_PENDING) return -EBUSY; continue; } |
