X-Git-Url: http://git.samba.org/samba.git/?a=blobdiff_plain;f=kernel%2Firq%2Fchip.c;h=18f29586f230e4d534eabcb9e387d2de38ddc948;hb=16217dc79dbc599b110dda26d0421df47904bba4;hp=e11e8afcf209b7293158e25df12de690f222c1d2;hpb=ecb3f394c5dba897d215a5422f1b363e93e2ce4e;p=sfrench%2Fcifs-2.6.git

diff --git a/kernel/irq/chip.c b/kernel/irq/chip.c
index e11e8afcf209..18f29586f230 100644
--- a/kernel/irq/chip.c
+++ b/kernel/irq/chip.c
@@ -829,6 +829,17 @@ __irq_do_set_handler(struct irq_desc *desc, irq_flow_handler_t handle,
 	desc->name = name;
 
 	if (handle != handle_bad_irq && is_chained) {
+		/*
+		 * We're about to start this interrupt immediately,
+		 * hence the need to set the trigger configuration.
+		 * But the .set_type callback may have overridden the
+		 * flow handler, ignoring that we're dealing with a
+		 * 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;
+
 		irq_settings_set_noprobe(desc);
 		irq_settings_set_norequest(desc);
 		irq_settings_set_nothread(desc);