diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-11-30 14:55:11 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-11-30 14:55:11 +0900 |
| commit | 7d0dbea312a6508389241b4fb6cda1c4d1e32d6e (patch) | |
| tree | f23b591e8c6f921c91fce00a6453d4087ec3c071 /drivers/media/video/mx3_camera.c | |
| parent | 5c4986b8a9ddd9cf649abe38a102866f7809b1d2 (diff) | |
| parent | 193006f7e3b1abd42d7a3677b54fa2996461a842 (diff) | |
Merge branch 'sh/urgent' into sh-latest
Diffstat (limited to 'drivers/media/video/mx3_camera.c')
| -rw-r--r-- | drivers/media/video/mx3_camera.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/media/video/mx3_camera.c b/drivers/media/video/mx3_camera.c index 29c5fc348133..aa871c2936b3 100644 --- a/drivers/media/video/mx3_camera.c +++ b/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; |