---

yaml --- r: 222065 b: refs/heads/master c: a8de663 h: refs/heads/master i: 222063: efd33ed v: v3
git-mirror · Nov 9, 2010 · c891a28 · c891a28
1 parent 3320237
commit c891a28
Show file tree

Hide file tree

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