Commit f3866db8 authored Jun 28, 2010 by Linus Torvalds

Merge branch 'irq-fixes-for-linus' of...

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

parents f014d937 46732475

kernel/irq/manage.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -456,6 +456,9 @@ int __irq_set_trigger(struct irq_desc *desc, unsigned int irq,
		/* 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;