From c50c601980a4b2450dae9a052f9c0f7e1fcd3171 Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Thu, 31 Dec 2009 17:26:05 -0800 Subject: [PATCH] --- yaml --- r: 178710 b: refs/heads/master c: cd6e125c58ae1561bedb6ea6f70b00d6c2599d62 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 3b64c898e41a..350b2ed9ee22 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: df9d1e8a4379119cbc47c474f168b5103e404e17 +refs/heads/master: cd6e125c58ae1561bedb6ea6f70b00d6c2599d62 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); }