---

yaml --- r: 192141 b: refs/heads/master c: a6407dd h: refs/heads/master i: 192139: 9234fdf v: v3
git-mirror · May 12, 2010 · baed804 · baed804
1 parent d814fb1
commit baed804
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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;