diff options
| author | Steve French <sfrench@us.ibm.com> | 2010-01-01 00:00:42 -0500 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2010-01-01 00:00:42 -0500 |
| commit | dfae0acd26aebbbafde038617892df728194f4ae (patch) | |
| tree | 3a2de5b95c007ae89106356bdb0175af27f263f2 | |
| parent | 6a5fa2362b628ee950080bef8895a6fb62f58ab4 (diff) | |
| parent | cd6e125c58ae1561bedb6ea6f70b00d6c2599d62 (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
| -rw-r--r-- | drivers/mfd/twl4030-irq.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mfd/twl4030-irq.c b/drivers/mfd/twl4030-irq.c index 20d29bafc9f5..9df9a5ad38f9 100644 --- a/drivers/mfd/twl4030-irq.c +++ b/drivers/mfd/twl4030-irq.c | |||
| @@ -568,12 +568,12 @@ static void twl4030_sih_do_edge(struct work_struct *work) | |||
| 568 | 568 | ||
| 569 | bytes[byte] &= ~(0x03 << off); | 569 | bytes[byte] &= ~(0x03 << off); |
| 570 | 570 | ||
| 571 | spin_lock_irq(&d->lock); | 571 | raw_spin_lock_irq(&d->lock); |
| 572 | if (d->status & IRQ_TYPE_EDGE_RISING) | 572 | if (d->status & IRQ_TYPE_EDGE_RISING) |
| 573 | bytes[byte] |= BIT(off + 1); | 573 | bytes[byte] |= BIT(off + 1); |
| 574 | if (d->status & IRQ_TYPE_EDGE_FALLING) | 574 | if (d->status & IRQ_TYPE_EDGE_FALLING) |
| 575 | bytes[byte] |= BIT(off + 0); | 575 | bytes[byte] |= BIT(off + 0); |
| 576 | spin_unlock_irq(&d->lock); | 576 | raw_spin_unlock_irq(&d->lock); |
| 577 | 577 | ||
| 578 | edge_change &= ~BIT(i); | 578 | edge_change &= ~BIT(i); |
| 579 | } | 579 | } |