Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5d69561b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull irq fix from Ingo Molnar:
 "This fixes a genirq regression that resulted in the Intel/Broxton
  pinctrl/GPIO driver (and possibly others) spewing warnings"

* 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  genirq: Use irq type from irqdata instead of irqdesc
parents 5ad62a9e 7ee7e87d

kernel/irq/manage.c

+2 −2
Original line number Diff line number Diff line
@@ -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;