The patch titled input: AD7877 driver fixup has been added to the -mm tree. Its filename is input-touchscreen-driver-add-support-ad7877-touchscreen-driver-fix.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: input: AD7877 driver fixup From: Michael Hennerich <michael.hennerich@xxxxxxxxxx> - Test flag with spinlock hold Signed-off-by: Michael Hennerich <michael.hennerich@xxxxxxxxxx> Signed-off-by: Bryan Wu <cooloney@xxxxxxxxxx> Cc: Jiri Kosina <jkosina@xxxxxxx> Cc: Dmitry Torokhov <dmitry.torokhov@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/input/touchscreen/ad7877.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff -puN drivers/input/touchscreen/ad7877.c~input-touchscreen-driver-add-support-ad7877-touchscreen-driver-fix drivers/input/touchscreen/ad7877.c --- a/drivers/input/touchscreen/ad7877.c~input-touchscreen-driver-add-support-ad7877-touchscreen-driver-fix +++ a/drivers/input/touchscreen/ad7877.c @@ -388,10 +388,11 @@ static irqreturn_t ad7877_irq(int irq, v * doesn't get issued twice while in work. */ - if (ts->pending) - return IRQ_HANDLED; - spin_lock_irqsave(&ts->lock, flags); + if (ts->pending) { + spin_unlock_irqrestore(&ts->lock, flags); + return IRQ_HANDLED; + } ts->pending = 1; spin_unlock_irqrestore(&ts->lock, flags); @@ -420,10 +421,12 @@ static void ad7877_disable(struct ad7877 { unsigned long flags; - if (ts->disabled) + spin_lock_irqsave(&ts->lock, flags); + if (ts->disabled) { + spin_unlock_irqrestore(&ts->lock, flags); return; + } - spin_lock_irqsave(&ts->lock, flags); ts->disabled = 1; disable_irq(ts->spi->irq); spin_unlock_irqrestore(&ts->lock, flags); @@ -443,10 +446,11 @@ static void ad7877_enable(struct ad7877 { unsigned long flags; - if (!ts->disabled) - return; - spin_lock_irqsave(&ts->lock, flags); + if (ts->disabled) { + spin_unlock_irqrestore(&ts->lock, flags); + return; + } ts->disabled = 0; enable_irq(ts->spi->irq); spin_unlock_irqrestore(&ts->lock, flags); _ Patches currently in -mm which might be from michael.hennerich@xxxxxxxxxx are input-touchscreen-driver-add-support-ad7877-touchscreen-driver.patch input-touchscreen-driver-add-support-ad7877-touchscreen-driver-fix.patch input-ad7879-touchscreen-driver.patch input-ad7879-touchscreen-driver-cleanup.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html