2 files changed, 4 insertions, 0 deletions

diff --git a/kernel/irq/chip.c b/kernel/irq/chip.c
index baa5c4acad83..9639ab8bece0 100644
--- a/kernel/irq/chip.c
+++ b/kernel/irq/chip.c
@@ -65,9 +65,11 @@ int set_irq_type(unsigned int irq, unsigned int type)
         if (type == IRQ_TYPE_NONE)
                 return 0;
 
+        chip_bus_lock(desc);
         raw_spin_lock_irqsave(&desc->lock, flags);
         ret = __irq_set_trigger(desc, irq, type);
         raw_spin_unlock_irqrestore(&desc->lock, flags);
+        chip_bus_sync_unlock(desc);
         return ret;
 }
 EXPORT_SYMBOL(set_irq_type);
diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c
index ba84307fbf24..a400db220cf3 100644
--- a/kernel/irq/manage.c
+++ b/kernel/irq/manage.c
@@ -454,6 +454,7 @@ int set_irq_wake(unsigned int irq, unsigned int on)
         /* wakeup-capable irqs can be shared between drivers that
          * don't need to have the same sleep mode behaviors.
          */
+        chip_bus_lock(desc);
         raw_spin_lock_irqsave(&desc->lock, flags);
         if (on) {
                 if (desc->wake_depth++ == 0) {
@@ -476,6 +477,7 @@ int set_irq_wake(unsigned int irq, unsigned int on)
         }
 
         raw_spin_unlock_irqrestore(&desc->lock, flags);
+        chip_bus_sync_unlock(desc);
         return ret;
 }
 EXPORT_SYMBOL(set_irq_wake);