Skip to content

L
linux-davinci
Commit dfae0acd authored by Steve French's avatar Steve French
Browse files
Options

Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6

parents 6a5fa236 cd6e125c
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
drivers/mfd/twl4030-irq.c
View file @ dfae0acd
...@@ -568,12 +568,12 @@ static void twl4030_sih_do_edge(struct work_struct *work) ...@@ -568,12 +568,12 @@ static void twl4030_sih_do_edge(struct work_struct *work)
bytes[byte] &= ~(0x03 << off); bytes[byte] &= ~(0x03 << off);
spin_lock_irq(&d->lock); raw_spin_lock_irq(&d->lock);
if (d->status & IRQ_TYPE_EDGE_RISING) if (d->status & IRQ_TYPE_EDGE_RISING)
bytes[byte] |= BIT(off + 1); bytes[byte] |= BIT(off + 1);
if (d->status & IRQ_TYPE_EDGE_FALLING) if (d->status & IRQ_TYPE_EDGE_FALLING)
bytes[byte] |= BIT(off + 0); bytes[byte] |= BIT(off + 0);
spin_unlock_irq(&d->lock); raw_spin_unlock_irq(&d->lock);
edge_change &= ~BIT(i); edge_change &= ~BIT(i);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment