diff options
| author | Linus Torvalds | 2017-05-21 20:45:26 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2017-05-21 20:45:26 +0200 |
| commit | e7a3d62749183576854cdc961b8b1cddf1aed71e (patch) | |
| tree | 3f4933ce4735ba563eea155317138e45a217563d /kernel/irq | |
| parent | Merge tag 'trace-v4.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/... (diff) | |
| parent | genirq: Fix chained interrupt data ordering (diff) | |
| download | kernel-qcow2-linux-e7a3d62749183576854cdc961b8b1cddf1aed71e.tar.gz kernel-qcow2-linux-e7a3d62749183576854cdc961b8b1cddf1aed71e.tar.xz kernel-qcow2-linux-e7a3d62749183576854cdc961b8b1cddf1aed71e.zip | |
Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull irq fixes from Thomas Gleixner:
"A set of small fixes for the irq subsystem:
- Cure a data ordering problem with chained interrupts
- Three small fixlets for the mbigen irq chip"
* 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
genirq: Fix chained interrupt data ordering
irqchip/mbigen: Fix the clear register offset calculation
irqchip/mbigen: Fix potential NULL dereferencing
irqchip/mbigen: Fix memory mapping code
Diffstat (limited to 'kernel/irq')
| -rw-r--r-- | kernel/irq/chip.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/irq/chip.c b/kernel/irq/chip.c index 686be4b73018..c94da688ee9b 100644 --- a/kernel/irq/chip.c +++ b/kernel/irq/chip.c @@ -880,8 +880,8 @@ irq_set_chained_handler_and_data(unsigned int irq, irq_flow_handler_t handle, if (!desc) return; - __irq_do_set_handler(desc, handle, 1, NULL); desc->irq_common_data.handler_data = data; + __irq_do_set_handler(desc, handle, 1, NULL); irq_put_desc_busunlock(desc, flags); } |