diff options
-rw-r--r-- | kernel/irq/manage.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c index 53e944811ca6..3dc6a61bf06a 100644 --- a/kernel/irq/manage.c +++ b/kernel/irq/manage.c | |||
@@ -1076,12 +1076,9 @@ __setup_irq(unsigned int irq, struct irq_desc *desc, struct irqaction *new) | |||
1076 | * set the trigger type must match. Also all must | 1076 | * set the trigger type must match. Also all must |
1077 | * agree on ONESHOT. | 1077 | * agree on ONESHOT. |
1078 | */ | 1078 | */ |
1079 | |||
1080 | #define IRQF_MISMATCH \ | ||
1081 | (IRQF_TRIGGER_MASK | IRQF_ONESHOT | IRQF_NO_SUSPEND) | ||
1082 | |||
1083 | if (!((old->flags & new->flags) & IRQF_SHARED) || | 1079 | if (!((old->flags & new->flags) & IRQF_SHARED) || |
1084 | ((old->flags ^ new->flags) & IRQF_MISMATCH)) | 1080 | ((old->flags ^ new->flags) & IRQF_TRIGGER_MASK) || |
1081 | ((old->flags ^ new->flags) & IRQF_ONESHOT)) | ||
1085 | goto mismatch; | 1082 | goto mismatch; |
1086 | 1083 | ||
1087 | /* All handlers must agree on per-cpuness */ | 1084 | /* All handlers must agree on per-cpuness */ |