diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2010-11-05 05:26:03 -0400 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-11-09 12:07:28 -0500 |
| commit | a8de6635799b58b52c610da9ee390a3e900e7bc7 (patch) | |
| tree | 255ff8279a3d2ea746f0c8635adcf493998eb8f2 | |
| parent | 4f52610e290eb6bf63522b0dad886ac88c7623cd (diff) | |
[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>
| -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 @@ | |||
| 27 | 27 | ||
| 28 | #include <mach/ipu.h> | 28 | #include <mach/ipu.h> |
| 29 | #include <mach/mx3_camera.h> | 29 | #include <mach/mx3_camera.h> |
| 30 | #include <mach/dma.h> | ||
| 30 | 31 | ||
| 31 | #define MX3_CAM_DRV_NAME "mx3-camera" | 32 | #define MX3_CAM_DRV_NAME "mx3-camera" |
| 32 | 33 | ||
| @@ -638,6 +639,9 @@ static bool chan_filter(struct dma_chan *chan, void *arg) | |||
| 638 | struct dma_chan_request *rq = arg; | 639 | struct dma_chan_request *rq = arg; |
| 639 | struct mx3_camera_pdata *pdata; | 640 | struct mx3_camera_pdata *pdata; |
| 640 | 641 | ||
| 642 | if (!imx_dma_is_ipu(chan)) | ||
| 643 | return false; | ||
| 644 | |||
| 641 | if (!rq) | 645 | if (!rq) |
| 642 | return false; | 646 | return false; |
| 643 | 647 | ||
