diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2010-11-05 06:26:03 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-11-09 15:07:28 -0200 |
| commit | a8de6635799b58b52c610da9ee390a3e900e7bc7 (patch) | |
| tree | 255ff8279a3d2ea746f0c8635adcf493998eb8f2 /drivers/media | |
| parent | 4f52610e290eb6bf63522b0dad886ac88c7623cd (diff) | |
| download | blackbird-op-linux-a8de6635799b58b52c610da9ee390a3e900e7bc7.tar.gz blackbird-op-linux-a8de6635799b58b52c610da9ee390a3e900e7bc7.zip | |
[media] ARM mx3_camera: check for DMA engine type
We have two dma engines in MX3 systems: The IPU and the SDMA
engine. We have to check if we got a channel from the correct
engine before proceeding with a channel.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Cc: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media')
| -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; |
