From 832e247dc4cc9893da28657ce7a78edab0318ab8 Mon Sep 17 00:00:00 2001
From: Shawn Guo <shawn.guo@linaro.org>
Date: Thu, 30 Jun 2011 16:06:33 +0800
Subject: [PATCH] --- yaml --- r: 262043 b: refs/heads/master c:
 95bfea1675c02d83cf1923272e62f91db11cbb8f h: refs/heads/master i:   262041:
 c4beedf6feeba99872c13dbca08a279b34c97462   262039:
 e811aa1929594f435fc71bd0720cd864eddf35ac v: v3

---
 [refs]                      |  2 +-
 trunk/drivers/dma/mxs-dma.c | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index bdb5d10f603d..ff06649797e9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b89243dd0e6a1c96a4a346cb3e1ba2c637cdfe98
+refs/heads/master: 95bfea1675c02d83cf1923272e62f91db11cbb8f
diff --git a/trunk/drivers/dma/mxs-dma.c b/trunk/drivers/dma/mxs-dma.c
index 88aad4f54002..2870d919f112 100644
--- a/trunk/drivers/dma/mxs-dma.c
+++ b/trunk/drivers/dma/mxs-dma.c
@@ -327,10 +327,12 @@ static int mxs_dma_alloc_chan_resources(struct dma_chan *chan)
 
 	memset(mxs_chan->ccw, 0, PAGE_SIZE);
 
-	ret = request_irq(mxs_chan->chan_irq, mxs_dma_int_handler,
-				0, "mxs-dma", mxs_dma);
-	if (ret)
-		goto err_irq;
+	if (mxs_chan->chan_irq != NO_IRQ) {
+		ret = request_irq(mxs_chan->chan_irq, mxs_dma_int_handler,
+					0, "mxs-dma", mxs_dma);
+		if (ret)
+			goto err_irq;
+	}
 
 	ret = clk_enable(mxs_dma->clk);
 	if (ret)