Pull motherboard into release branch

[deliverable/linux.git] / kernel / irq / manage.c

diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c
index ac766ad573e85e09c101ce0ebf7a2a595dc57a22..1279e3499534d490212053812a64671a59b3132d 100644 (file)
--- a/kernel/irq/manage.c
+++ b/kernel/irq/manage.c
@@ -246,8 +246,10 @@ int setup_irq(unsigned int irq, struct irqaction * new)
 
 mismatch:
        spin_unlock_irqrestore(&desc->lock, flags);
-       printk(KERN_ERR "%s: irq handler mismatch\n", __FUNCTION__);
-       dump_stack();
+       if (!(new->flags & SA_PROBEIRQ)) {
+               printk(KERN_ERR "%s: irq handler mismatch\n", __FUNCTION__);
+               dump_stack();
+       }
        return -EBUSY;
 }