From mboxrd@z Thu Jan 1 00:00:00 1970 From: Bryan Wu Subject: [PATCH 1/1] input: AD7877 driver fixup Date: Thu, 30 Oct 2008 17:46:50 +0800 Message-ID: <1225360010-20176-1-git-send-email-cooloney@kernel.org> Return-path: Received: from nwd2mail11.analog.com ([137.71.25.57]:3517 "EHLO nwd2mail11.analog.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753410AbYJ3JqH (ORCPT ); Thu, 30 Oct 2008 05:46:07 -0400 Sender: linux-input-owner@vger.kernel.org List-Id: linux-input@vger.kernel.org To: dtor@mail.ru, akpm@linux-foundation.org Cc: linux-input@vger.kernel.org, linux-kernel@vger.kernel.org, Michael Hennerich , Bryan Wu From: Michael Hennerich - Test flag with spinlock hold Signed-off-by: Michael Hennerich Signed-off-by: Bryan Wu --- drivers/input/touchscreen/ad7877.c | 20 ++++++++++++-------- 1 files changed, 12 insertions(+), 8 deletions(-) diff --git a/drivers/input/touchscreen/ad7877.c b/drivers/input/touchscreen/ad7877.c index aaf88c9..6615bcd 100644 --- a/drivers/input/touchscreen/ad7877.c +++ b/drivers/input/touchscreen/ad7877.c @@ -388,10 +388,11 @@ static irqreturn_t ad7877_irq(int irq, void *handle) * 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 *ts) { 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 *ts) { 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); -- 1.5.6