From 3d15ce7fbebcef03f0b3a233ab78a8cb11f00606 Mon Sep 17 00:00:00 2001 From: Steve French Date: Fri, 1 Jan 2010 05:00:42 +0000 Subject: [PATCH] --- yaml --- r: 180420 b: refs/heads/master c: dfae0acd26aebbbafde038617892df728194f4ae h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/mfd/twl4030-irq.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index c3c63caf551b..4b6ae59b6d4d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6a5fa2362b628ee950080bef8895a6fb62f58ab4 +refs/heads/master: dfae0acd26aebbbafde038617892df728194f4ae diff --git a/trunk/drivers/mfd/twl4030-irq.c b/trunk/drivers/mfd/twl4030-irq.c index 20d29bafc9f5..9df9a5ad38f9 100644 --- a/trunk/drivers/mfd/twl4030-irq.c +++ b/trunk/drivers/mfd/twl4030-irq.c @@ -568,12 +568,12 @@ static void twl4030_sih_do_edge(struct work_struct *work) bytes[byte] &= ~(0x03 << off); - spin_lock_irq(&d->lock); + raw_spin_lock_irq(&d->lock); if (d->status & IRQ_TYPE_EDGE_RISING) bytes[byte] |= BIT(off + 1); if (d->status & IRQ_TYPE_EDGE_FALLING) bytes[byte] |= BIT(off + 0); - spin_unlock_irq(&d->lock); + raw_spin_unlock_irq(&d->lock); edge_change &= ~BIT(i); }