IRQ fix
Linus,
Please pull the latest irq-urgent-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git irq-urgent-for-linus
# HEAD: 7ee7e87dfb158e79019ea1d5ea1b0e6f2bc93ee4 genirq: Use irq type from irqdata instead of irqdesc
This fixes a genirq regression that resulted in the Intel/Broxton pinctrl/GPIO driver (and possibly others) spewing warnings.
Thanks,
Ingo
------------------>
Thomas Gleixner (1):
genirq: Use irq type from irqdata instead of irqdesc
kernel/irq/manage.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
kernel/irq/manage.c +2 -2
@@ -1341,12 +1341,12 @@ __setup_irq(unsigned int irq, struct irq_desc *desc, struct irqaction *new) }else if (new->flags &IRQF_TRIGGER_MASK ) {unsigned int nmsk = new->flags &IRQF_TRIGGER_MASK ; -unsigned int omsk =irq_settings_get_trigger_mask (desc); +unsigned int omsk =irqd_get_trigger_type (&desc->irq_data);if (nmsk != omsk)/* hope the handler works with current trigger mode */ pr_warn ("irq %d uses trigger mode %u; requested %u\n" , - irq, nmsk, omsk); + irq, omsk, nmsk); } *old_ptr = new;