diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2010-08-16 08:03:04 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2010-11-15 09:25:01 +0100 |
| commit | 1b346af2f88a0e19e718a843d39d34e41e5527e1 (patch) | |
| tree | 1c4a9bd481f3ea91f5057d3db597eca70266fec0 | |
| parent | f0573e6db1d1e637e20011f40264b2f5b5880587 (diff) | |
| download | linux-stable-1b346af2f88a0e19e718a843d39d34e41e5527e1.tar.gz linux-stable-1b346af2f88a0e19e718a843d39d34e41e5527e1.tar.bz2 linux-stable-1b346af2f88a0e19e718a843d39d34e41e5527e1.zip | |
ARM mx3fb: 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>
Reviewed-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
| -rw-r--r-- | drivers/video/mx3fb.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/video/mx3fb.c b/drivers/video/mx3fb.c index 7cfc170bce19..ca0f6be9d12e 100644 --- a/drivers/video/mx3fb.c +++ b/drivers/video/mx3fb.c @@ -27,6 +27,7 @@ #include <linux/clk.h> #include <linux/mutex.h> +#include <mach/dma.h> #include <mach/hardware.h> #include <mach/ipu.h> #include <mach/mx3fb.h> @@ -1420,6 +1421,9 @@ static bool chan_filter(struct dma_chan *chan, void *arg) struct device *dev; struct mx3fb_platform_data *mx3fb_pdata; + if (!imx_dma_is_ipu(chan)) + return false; + if (!rq) return false; |