aboutsummaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'drivers')
-rw-r--r--drivers/mfd/glamo/glamo-core.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/mfd/glamo/glamo-core.c b/drivers/mfd/glamo/glamo-core.c
index 77e25a65a9b..287807a0d0c 100644
--- a/drivers/mfd/glamo/glamo-core.c
+++ b/drivers/mfd/glamo/glamo-core.c
@@ -348,15 +348,13 @@ static void glamo_irq_demux_handler(unsigned int irq, struct irq_desc *desc)
{
const unsigned int cpu = smp_processor_id();
- spin_lock(&desc->lock);
-
desc->status &= ~(IRQ_REPLAY | IRQ_WAITING);
if (unlikely(desc->status & IRQ_INPROGRESS)) {
desc->status |= (IRQ_PENDING | IRQ_MASKED);
desc->chip->mask(irq);
desc->chip->ack(irq);
- goto out_unlock;
+ return;
}
kstat_cpu(cpu).irqs[irq]++;
@@ -387,9 +385,6 @@ static void glamo_irq_demux_handler(unsigned int irq, struct irq_desc *desc)
} while ((desc->status & (IRQ_PENDING | IRQ_DISABLED)) == IRQ_PENDING);
desc->status &= ~IRQ_INPROGRESS;
-
-out_unlock:
- spin_unlock(&desc->lock);
}
/***********************************************************************