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

Commit 6c9ca571 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Revert "genirq: Use irqd_get_trigger_type to compare the trigger type for shared IRQs" 



This reverts commit f2596a98 which is
commit 382bd4de61827dbaaf5fb4fb7b1f4be4a86505e7 upstream.

It causes too many problems with the stable tree, and would require too
many other things to be backported, so just revert it.

Reported-by: default avatarGuenter Roeck <linux@roeck-us.net>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Hans de Goede <hdegoede@redhat.com>
Cc: Marc Zyngier <marc.zyngier@arm.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Sasha Levin <alexander.levin@microsoft.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 6505dd1f

kernel/irq/manage.c

+1 −3
Original line number Diff line number Diff line
@@ -1210,10 +1210,8 @@ __setup_irq(unsigned int irq, struct irq_desc *desc, struct irqaction *new) 
		 * set the trigger type must match. Also all must

		 * agree on ONESHOT.

		 */

		unsigned int oldtype = irqd_get_trigger_type(&desc->irq_data);



		if (!((old->flags & new->flags) & IRQF_SHARED) ||

		    (oldtype != (new->flags & IRQF_TRIGGER_MASK)) ||

		    ((old->flags ^ new->flags) & IRQF_TRIGGER_MASK) ||

		    ((old->flags ^ new->flags) & IRQF_ONESHOT))

			goto mismatch;