summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2017-05-21 11:45:26 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2017-05-21 11:45:26 -0700
commite7a3d62749183576854cdc961b8b1cddf1aed71e (patch)
tree3f4933ce4735ba563eea155317138e45a217563d /kernel
parent56f410cf45a1c1f68f77741990e0435b06a07676 (diff)
parent2c4569ca26986d18243f282dd727da27e9adae4c (diff)
downloadlinux-stable-e7a3d62749183576854cdc961b8b1cddf1aed71e.tar.gz
linux-stable-e7a3d62749183576854cdc961b8b1cddf1aed71e.tar.bz2
linux-stable-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')
-rw-r--r--kernel/irq/chip.c2
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);
}