diff options
author | Paul Mundt <lethal@linux-sh.org> | 2010-11-19 08:04:25 (GMT) |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2010-11-19 08:04:25 (GMT) |
commit | fe040be2fdc49a4132c5f64359c629aeeb8e4947 (patch) | |
tree | 40323a8f05d3754372f561bb8f4698ef1a4e9c8f /drivers/media/video/mx3_camera.c | |
parent | 2006920a18cc9f499e5cccf9e6f1aa9f6120705e (diff) | |
parent | 6722a4016d7f5f107a82ad71a3ee1ccec105532f (diff) | |
download | linux-fsl-qoriq-fe040be2fdc49a4132c5f64359c629aeeb8e4947.tar.xz |
Merge branch 'common/fbdev-mipi' of master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6
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 29c5fc3..aa871c2 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; |