1 files changed, 3 insertions, 6 deletions

diff --git a/kernel/irq/pm.c b/kernel/irq/pm.c
index 1b1b67a73218..74ca6bb541d5 100644
--- a/kernel/irq/pm.c
+++ b/kernel/irq/pm.c
@@ -51,7 +51,7 @@ void irq_pm_remove_action(struct irq_desc *desc, struct irqaction *action)
 
 static void suspend_device_irq(struct irq_desc *desc, int irq)
 {
-        if (!desc->action || (desc->action->flags & IRQF_NO_SUSPEND))
+        if (!desc->action || desc->no_suspend_depth)
                 return;
 
         desc->istate |= IRQS_SUSPENDED;
@@ -94,11 +94,8 @@ static void resume_irq(struct irq_desc *desc, int irq)
         if (desc->istate & IRQS_SUSPENDED)
                 goto resume;
 
-        if (!desc->action)
-                return;
-
-        /* Interrupts marked with that flag are force reenabled */
-        if (!(desc->action->flags & IRQF_FORCE_RESUME))
+        /* Force resume the interrupt? */
+        if (!desc->force_resume_depth)
                 return;
 
         /* Pretend that it got disabled ! */