1 files changed, 10 insertions, 1 deletions

diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c
index 538fce2db51..a06b9b6d6b5 100644
--- a/kernel/irq/manage.c
+++ b/kernel/irq/manage.c
@@ -359,8 +359,17 @@ EXPORT_SYMBOL(disable_irq);
 
 void __enable_irq(struct irq_desc *desc, unsigned int irq, bool resume)
 {
-        if (resume)
+        if (resume) {
+                if (!(desc->status & IRQ_SUSPENDED)) {
+                        if (!desc->action)
+                                return;
+                        if (!(desc->action->flags & IRQF_FORCE_RESUME))
+                                return;
+                        /* Pretend that it got disabled ! */
+                        desc->depth++;
+                }
                 desc->status &= ~IRQ_SUSPENDED;
+        }
 
         switch (desc->depth) {
         case 0: