1 files changed, 4 insertions, 1 deletions

diff --git a/kernel/irq/chip.c b/kernel/irq/chip.c
index b8aa3dfe8301..9c9b573a718e 100644
--- a/kernel/irq/chip.c
+++ b/kernel/irq/chip.c
@@ -710,11 +710,14 @@ void irq_modify_status(unsigned int irq, unsigned long clr, unsigned long set)
 
         irq_settings_clr_and_set(desc, clr, set);
 
-        irqd_clear(&desc->irq_data, IRQD_NO_BALANCING | IRQD_PER_CPU);
+        irqd_clear(&desc->irq_data, IRQD_NO_BALANCING | IRQD_PER_CPU |
+                   IRQD_TRIGGER_MASK | IRQD_LEVEL);
         if (irq_settings_has_no_balance_set(desc))
                 irqd_set(&desc->irq_data, IRQD_NO_BALANCING);
         if (irq_settings_is_per_cpu(desc))
                 irqd_set(&desc->irq_data, IRQD_PER_CPU);
 
+        irqd_set(&desc->irq_data, irq_settings_get_trigger_mask(desc));
+
         raw_spin_unlock_irqrestore(&desc->lock, flags);
 }