1 files changed, 2 insertions, 2 deletions

diff --git a/kernel/irq/autoprobe.c b/kernel/irq/autoprobe.c
index 5c988bba401f..ed98c7d46cf2 100644
--- a/kernel/irq/autoprobe.c
+++ b/kernel/irq/autoprobe.c
@@ -40,7 +40,7 @@ unsigned long probe_irq_on(void)
                 desc = irq_desc + i;
 
                 spin_lock_irq(&desc->lock);
-                if (!desc->action)
+                if (!desc->action && !(desc->status & IRQ_NOPROBE))
                         desc->chip->startup(i);
                 spin_unlock_irq(&desc->lock);
         }
@@ -57,7 +57,7 @@ unsigned long probe_irq_on(void)
                 desc = irq_desc + i;
 
                 spin_lock_irq(&desc->lock);
-                if (!desc->action) {
+                if (!desc->action && !(desc->status & IRQ_NOPROBE)) {
                         desc->status |= IRQ_AUTODETECT | IRQ_WAITING;
                         if (desc->chip->startup(i))
                                 desc->status |= IRQ_PENDING;