浏览代码

Revert "PM / sleep / irq: Do not suspend wakeup interrupts"

This reverts commit d709f7bcbb3ab01704fa7b37a2e4b981cf3783c1.

Undo, because it might break exisiting functionality.

Requested-by: Rafael J. Wysocki <rjw@rjwysocki.net>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Thomas Gleixner 11 年之前
父节点
当前提交
21d1f908d3
共有 1 个文件被更改,包括 1 次插入2 次删除
  1. 1 2
      kernel/irq/manage.c

+ 1 - 2
kernel/irq/manage.c

@@ -385,8 +385,7 @@ setup_affinity(unsigned int irq, struct irq_desc *desc, struct cpumask *mask)
 void __disable_irq(struct irq_desc *desc, unsigned int irq, bool suspend)
 void __disable_irq(struct irq_desc *desc, unsigned int irq, bool suspend)
 {
 {
 	if (suspend) {
 	if (suspend) {
-		if (!desc->action || (desc->action->flags & IRQF_NO_SUSPEND) ||
-		    irqd_has_set(&desc->irq_data, IRQD_WAKEUP_STATE))
+		if (!desc->action || (desc->action->flags & IRQF_NO_SUSPEND))
 			return;
 			return;
 		desc->istate |= IRQS_SUSPENDED;
 		desc->istate |= IRQS_SUSPENDED;
 	}
 	}