diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-02-27 07:54:57 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-02-27 07:54:57 -0800 |
| commit | faf3502a3fed9951ea9f5a696c0bd2c1d056d7b4 (patch) | |
| tree | 05bc5d6ea9601d0b4f491b328eba5ccf1186a463 /kernel/irq/manage.c | |
| parent | 048cd4e51d24ebf7f3552226d03c769d6ad91658 (diff) | |
| parent | b4bc724e82e80478cba5fe9825b62e71ddf78757 (diff) | |
Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
* 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
genirq: Handle pending irqs in irq_startup()
genirq: Unmask oneshot irqs when thread was not woken
Diffstat (limited to 'kernel/irq/manage.c')
| -rw-r--r-- | kernel/irq/manage.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c index a9a9dbe49fe..32313c08444 100644 --- a/kernel/irq/manage.c +++ b/kernel/irq/manage.c @@ -1027,7 +1027,7 @@ __setup_irq(unsigned int irq, struct irq_desc *desc, struct irqaction *new) desc->istate |= IRQS_ONESHOT; if (irq_settings_can_autoenable(desc)) - irq_startup(desc); + irq_startup(desc, true); else /* Undo nested disables: */ desc->depth = 1; |