From c891a288f921833b5e764b764891c68d836e5395 Mon Sep 17 00:00:00 2001
From: Sascha Hauer <s.hauer@pengutronix.de>
Date: Fri, 5 Nov 2010 06:26:03 -0300
Subject: [PATCH] --- yaml --- r: 222065 b: refs/heads/master c:
 a8de6635799b58b52c610da9ee390a3e900e7bc7 h: refs/heads/master i:   222063:
 efd33edfc1287d082257bc9e66ded58a84422f1a v: v3

---
 [refs]                                 | 2 +-
 trunk/drivers/media/video/mx3_camera.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 4e45e38ec031..fe563655ff5d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4f52610e290eb6bf63522b0dad886ac88c7623cd
+refs/heads/master: a8de6635799b58b52c610da9ee390a3e900e7bc7
diff --git a/trunk/drivers/media/video/mx3_camera.c b/trunk/drivers/media/video/mx3_camera.c
index 29c5fc348133..aa871c2936b3 100644
--- a/trunk/drivers/media/video/mx3_camera.c
+++ b/trunk/drivers/media/video/mx3_camera.c
@@ -27,6 +27,7 @@
 
 #include <mach/ipu.h>
 #include <mach/mx3_camera.h>
+#include <mach/dma.h>
 
 #define MX3_CAM_DRV_NAME "mx3-camera"
 
@@ -638,6 +639,9 @@ static bool chan_filter(struct dma_chan *chan, void *arg)
 	struct dma_chan_request *rq = arg;
 	struct mx3_camera_pdata *pdata;
 
+	if (!imx_dma_is_ipu(chan))
+		return false;
+
 	if (!rq)
 		return false;