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

This commit is contained in:
Steve French 2010-01-01 05:00:42 +00:00
commit dfae0acd26

View file

@ -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);
}