diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2011-02-12 06:10:49 -0500 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2011-02-19 06:58:06 -0500 |
commit | 43abe43ce0619d744c7a5bb15cce075e532b53b7 (patch) | |
tree | f915103a0d1d671d2f537c7852869b7ca4a0078b /kernel/irq/chip.c | |
parent | e7bcecb7b1d29b9ad5af939149a945658620ca8f (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/chip.c')
-rw-r--r-- | kernel/irq/chip.c | 2 |
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) | |||
65 | if (type == IRQ_TYPE_NONE) | 65 | if (type == IRQ_TYPE_NONE) |
66 | return 0; | 66 | return 0; |
67 | 67 | ||
68 | chip_bus_lock(desc); | ||
68 | raw_spin_lock_irqsave(&desc->lock, flags); | 69 | raw_spin_lock_irqsave(&desc->lock, flags); |
69 | ret = __irq_set_trigger(desc, irq, type); | 70 | ret = __irq_set_trigger(desc, irq, type); |
70 | raw_spin_unlock_irqrestore(&desc->lock, flags); | 71 | raw_spin_unlock_irqrestore(&desc->lock, flags); |
72 | chip_bus_sync_unlock(desc); | ||
71 | return ret; | 73 | return ret; |
72 | } | 74 | } |
73 | EXPORT_SYMBOL(set_irq_type); | 75 | EXPORT_SYMBOL(set_irq_type); |