From baed8045691f27044f7144ff1c1d5162017cc55c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arve=20Hj=C3=B8nnev=C3=A5g?= <arve@android.com>
Date: Fri, 17 Apr 2009 18:21:34 -0700
Subject: [PATCH] --- yaml --- r: 192141 b: refs/heads/master c:
 a6407dd7b89f0de39d315eee64ad59dd68187b38 h: refs/heads/master i:   192139:
 9234fdf83c8abd2680e5aaeb86f0dc4d605eef8a v: v3

---
 [refs]                        | 2 +-
 trunk/arch/arm/mach-msm/dma.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 88ab33602486..bba0a256e696 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5f5d585167dadce1c895a860ae0be0dc6f48ee82
+refs/heads/master: a6407dd7b89f0de39d315eee64ad59dd68187b38
diff --git a/trunk/arch/arm/mach-msm/dma.c b/trunk/arch/arm/mach-msm/dma.c
index f5420f9585c5..09c0c0f9729b 100644
--- a/trunk/arch/arm/mach-msm/dma.c
+++ b/trunk/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;