diff options
| author | Dmitry Shmidt <dimitrysh@google.com> | 2018-03-30 08:43:54 -0700 |
|---|---|---|
| committer | Dmitry Shmidt <dimitrysh@google.com> | 2018-03-30 08:44:48 -0700 |
| commit | 2860b3771099b6ff9e91355a5a62cb59edcf49c5 (patch) | |
| tree | a44db06655a10feb1ccf44153fc014d816e30bdd | |
| parent | ac17382955bec3e2bbbf58cdb161bbe3eda91493 (diff) | |
Revert "genirq: Use irqd_get_trigger_type to compare the trigger type for shared IRQs"ASB-2018-04-05_3.18
This reverts commit 093c265afffb0a91a7611c3bb74d0883731a807b 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.
Change-Id: I56a1a448032127a1af2f29b993900bd19c3473d1
Reported-by: Guenter 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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
| -rw-r--r-- | kernel/irq/manage.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c index 5f23a04789db..e7ef539c56d9 100644 --- a/kernel/irq/manage.c +++ b/kernel/irq/manage.c @@ -1058,10 +1058,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; |