Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dfae0acd authored by Steve French's avatar Steve French
Browse files

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

parents 6a5fa236 cd6e125c

drivers/mfd/twl4030-irq.c

+2 −2
Original line number Diff line number Diff line
@@ -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);

	}