diff options
author | Paul Mackerras <paulus@samba.org> | 2006-05-05 05:45:48 (GMT) |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2006-05-05 05:45:48 (GMT) |
commit | f18fc729cd2d67b76e24206ee3567c1f6983c358 (patch) | |
tree | 9dbf177222d94213d9dd82d67de6d905e1a2b278 /kernel/irq/manage.c | |
parent | 5a43ee65620d628ba04deecf241b63b2410b97f2 (diff) | |
parent | d98550e334715b2d9e45f8f0f4e1608720108640 (diff) | |
download | linux-fsl-qoriq-f18fc729cd2d67b76e24206ee3567c1f6983c358.tar.xz |
Merge ../linux-2.6
Diffstat (limited to 'kernel/irq/manage.c')
-rw-r--r-- | kernel/irq/manage.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c index ac766ad..1279e34 100644 --- 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; } |