From b8f3c0256878b4ecfaafa18ad46f168243924759 Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Sat, 12 Feb 2011 12:10:49 +0100 Subject: [PATCH] --- yaml --- r: 234693 b: refs/heads/master c: 43abe43ce0619d744c7a5bb15cce075e532b53b7 h: refs/heads/master i: 234691: 4337d012a179f5b23ac66e05ab072417f7ad7f08 v: v3 --- [refs] | 2 +- trunk/kernel/irq/chip.c | 2 ++ trunk/kernel/irq/manage.c | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 09d60e8965f1..49b2fb89558d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e7bcecb7b1d29b9ad5af939149a945658620ca8f +refs/heads/master: 43abe43ce0619d744c7a5bb15cce075e532b53b7 diff --git a/trunk/kernel/irq/chip.c b/trunk/kernel/irq/chip.c index baa5c4acad83..9639ab8bece0 100644 --- a/trunk/kernel/irq/chip.c +++ b/trunk/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/trunk/kernel/irq/manage.c b/trunk/kernel/irq/manage.c index ba84307fbf24..a400db220cf3 100644 --- a/trunk/kernel/irq/manage.c +++ b/trunk/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);