diff options
Diffstat (limited to 'kernel/irq')
| -rw-r--r-- | kernel/irq/handle.c | 1 | ||||
| -rw-r--r-- | kernel/irq/manage.c | 18 |
2 files changed, 12 insertions, 7 deletions
diff --git a/kernel/irq/handle.c b/kernel/irq/handle.c index 402fa3aec1e..9b398d52f1b 100644 --- a/kernel/irq/handle.c +++ b/kernel/irq/handle.c @@ -32,6 +32,7 @@ struct irq_desc irq_desc[NR_IRQS] __cacheline_aligned = { [0 ... NR_IRQS-1] = { .status = IRQ_DISABLED, .chip = &no_irq_type, + .depth = 1, .lock = SPIN_LOCK_UNLOCKED, #ifdef CONFIG_SMP .affinity = CPU_MASK_ALL diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c index cae900a849c..9ea18879fb6 100644 --- a/kernel/irq/manage.c +++ b/kernel/irq/manage.c @@ -216,13 +216,17 @@ int setup_irq(unsigned int irq, struct irqaction *new) desc->status |= IRQ_PER_CPU; #endif if (!shared) { - desc->depth = 0; - desc->status &= ~(IRQ_DISABLED | IRQ_AUTODETECT | - IRQ_WAITING | IRQ_INPROGRESS); - if (desc->chip->startup) - desc->chip->startup(irq); - else - desc->chip->enable(irq); + desc->status &= ~(IRQ_AUTODETECT | IRQ_WAITING | + IRQ_INPROGRESS); + + if (!(desc->status & IRQ_NOAUTOEN)) { + desc->depth = 0; + desc->status &= ~IRQ_DISABLED; + if (desc->chip->startup) + desc->chip->startup(irq); + else + desc->chip->enable(irq); + } } spin_unlock_irqrestore(&desc->lock, flags); |