aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/irq/manage.c
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2011-02-12 06:10:49 -0500
committerThomas Gleixner <tglx@linutronix.de>2011-02-19 06:58:06 -0500
commit43abe43ce0619d744c7a5bb15cce075e532b53b7 (patch)
treef915103a0d1d671d2f537c7852869b7ca4a0078b /kernel/irq/manage.c
parente7bcecb7b1d29b9ad5af939149a945658620ca8f (diff)
genirq: Add missing buslock to set_irq_type(), set_irq_wake()
chips behind a slow bus cannot update the chip under desc->lock, but we miss the chip_buslock/chip_bus_sync_unlock() calls around the set type and set wake functions. Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'kernel/irq/manage.c')
-rw-r--r--kernel/irq/manage.c2
1 files changed, 2 insertions, 0 deletions
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)
454 /* wakeup-capable irqs can be shared between drivers that 454 /* wakeup-capable irqs can be shared between drivers that
455 * don't need to have the same sleep mode behaviors. 455 * don't need to have the same sleep mode behaviors.
456 */ 456 */
457 chip_bus_lock(desc);
457 raw_spin_lock_irqsave(&desc->lock, flags); 458 raw_spin_lock_irqsave(&desc->lock, flags);
458 if (on) { 459 if (on) {
459 if (desc->wake_depth++ == 0) { 460 if (desc->wake_depth++ == 0) {
@@ -476,6 +477,7 @@ int set_irq_wake(unsigned int irq, unsigned int on)
476 } 477 }
477 478
478 raw_spin_unlock_irqrestore(&desc->lock, flags); 479 raw_spin_unlock_irqrestore(&desc->lock, flags);
480 chip_bus_sync_unlock(desc);
479 return ret; 481 return ret;
480} 482}
481EXPORT_SYMBOL(set_irq_wake); 483EXPORT_SYMBOL(set_irq_wake);