diff options
| author | Florian Tobias Schandinat <FlorianSchandinat@gmx.de> | 2012-03-06 03:09:16 -0500 |
|---|---|---|
| committer | Florian Tobias Schandinat <FlorianSchandinat@gmx.de> | 2012-03-06 03:09:16 -0500 |
| commit | d282e4d9353b9e7971713aa9e78da716e4a1262d (patch) | |
| tree | 123aa2391841f37f4b8ae80c02eda4094e17994a /kernel/irq/manage.c | |
| parent | 2c0fad8e907abf059b21bdb24d183dcbf8d14c10 (diff) | |
| parent | 192cfd58774b4d17b2fe8bdc77d89c2ef4e0591d (diff) | |
Merge commit 'v3.3-rc6' into fbdev-next
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 a9a9dbe49fea..32313c084442 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) | |||
| 1027 | desc->istate |= IRQS_ONESHOT; | 1027 | desc->istate |= IRQS_ONESHOT; |
| 1028 | 1028 | ||
| 1029 | if (irq_settings_can_autoenable(desc)) | 1029 | if (irq_settings_can_autoenable(desc)) |
| 1030 | irq_startup(desc); | 1030 | irq_startup(desc, true); |
| 1031 | else | 1031 | else |
| 1032 | /* Undo nested disables: */ | 1032 | /* Undo nested disables: */ |
| 1033 | desc->depth = 1; | 1033 | desc->depth = 1; |