summaryrefslogtreecommitdiffstats
path: root/kernel/irq/chip.c
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2011-02-12 12:10:49 +0100
committerThomas Gleixner <tglx@linutronix.de>2011-02-19 12:58:06 +0100
commit43abe43ce0619d744c7a5bb15cce075e532b53b7 (patch)
treef915103a0d1d671d2f537c7852869b7ca4a0078b /kernel/irq/chip.c
parentgenirq: Make nr_irqs runtime expandable (diff)
downloadlinux-43abe43ce0619d744c7a5bb15cce075e532b53b7.tar.xz
linux-43abe43ce0619d744c7a5bb15cce075e532b53b7.zip
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/chip.c')
-rw-r--r--kernel/irq/chip.c2
1 files changed, 2 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);