summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArve Hjønnevåg <arve@android.com>2009-04-17 18:21:34 -0700
committerDaniel Walker <dwalker@codeaurora.org>2010-05-12 09:14:11 -0700
commita6407dd7b89f0de39d315eee64ad59dd68187b38 (patch)
treecdb566a03efddac50f331a33a4f93f8bcbccbece
parent5f5d585167dadce1c895a860ae0be0dc6f48ee82 (diff)
downloadblackbird-op-linux-a6407dd7b89f0de39d315eee64ad59dd68187b38.tar.gz
blackbird-op-linux-a6407dd7b89f0de39d315eee64ad59dd68187b38.zip
[ARM] msm: dma: disable_irq -> disable_irq_nosync
Signed-off-by: Arve Hjønnevåg <arve@android.com>
-rw-r--r--arch/arm/mach-msm/dma.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-msm/dma.c b/arch/arm/mach-msm/dma.c
index f5420f9585c5..09c0c0f9729b 100644
--- a/arch/arm/mach-msm/dma.c
+++ b/arch/arm/mach-msm/dma.c
@@ -220,7 +220,7 @@ static irqreturn_t msm_datamover_irq_handler(int irq, void *dev_id)
}
if (!channel_active)
- disable_irq(INT_ADM_AARM);
+ disable_irq_nosync(INT_ADM_AARM);
spin_unlock_irqrestore(&msm_dmov_lock, irq_flags);
return IRQ_HANDLED;
OpenPOWER on IntegriCloud