commit f3866db8f7534ba8bbb342bebcf5ede542035528
author Linus Torvalds <torvalds@linux-foundation.org> Mon Jun 28 12:23:12 2010 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> Mon Jun 28 12:23:12 2010 -0700
tree f73e761ac85faea698eb6ab700361ef199aa68c7
parent f014d937d61f47761f961eba903feb2ffa1793aa
parent 4673247562e39a17e09440fa1400819522ccd446

Merge branch 'irq-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'irq-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  genirq: Deal with desc->set_type() changing desc->chip

kernel/irq/manage.c

diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c
index 3164ba7..e149748 100644
--- a/kernel/irq/manage.c
+++ b/kernel/irq/manage.c
@@ -456,6 +456,9 @@
 		/* note that IRQF_TRIGGER_MASK == IRQ_TYPE_SENSE_MASK */
 		desc->status &= ~(IRQ_LEVEL | IRQ_TYPE_SENSE_MASK);
 		desc->status |= flags;
+
+		if (chip != desc->chip)
+			irq_chip_set_defaults(desc->chip);
 	}
 
 	return ret;