diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-09-30 10:44:27 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-09-30 10:44:27 +0200 |
| commit | 536e0e81e0b04305ce40f6cc4299d29dc9bbc673 (patch) | |
| tree | 1cb7f695bc220bb9cdc5cb9ed1ef005f7771b1fd /kernel/irq/chip.c | |
| parent | objtool: Add do_task_dead() to global noreturn list (diff) | |
| parent | Merge branch 'akpm' (patches from Andrew) (diff) | |
| download | linux-536e0e81e0b04305ce40f6cc4299d29dc9bbc673.tar.xz linux-536e0e81e0b04305ce40f6cc4299d29dc9bbc673.zip | |
Merge branch 'linus' into sched/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/irq/chip.c')
| -rw-r--r-- | kernel/irq/chip.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/kernel/irq/chip.c b/kernel/irq/chip.c index 637389088b3f..26ba5654d9d5 100644 --- a/kernel/irq/chip.c +++ b/kernel/irq/chip.c @@ -820,6 +820,8 @@ __irq_do_set_handler(struct irq_desc *desc, irq_flow_handler_t handle, desc->name = name; if (handle != handle_bad_irq && is_chained) { + unsigned int type = irqd_get_trigger_type(&desc->irq_data); + /* * We're about to start this interrupt immediately, * hence the need to set the trigger configuration. @@ -828,8 +830,10 @@ __irq_do_set_handler(struct irq_desc *desc, irq_flow_handler_t handle, * chained interrupt. Reset it immediately because we * do know better. */ - __irq_set_trigger(desc, irqd_get_trigger_type(&desc->irq_data)); - desc->handle_irq = handle; + if (type != IRQ_TYPE_NONE) { + __irq_set_trigger(desc, type); + desc->handle_irq = handle; + } irq_settings_set_noprobe(desc); irq_settings_set_norequest(desc); |