diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-11-23 09:37:25 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-11-23 09:37:25 +0000 |
| commit | f6a1f2184c0ea85ad98a4d6e450ad584423d10ce (patch) | |
| tree | 2e5f74b714dd46d2c781392fa330c0c339b5919e /drivers/video | |
| parent | b0c4d4ee4e4f13fa3f017c00319a18c1ea31b7d7 (diff) | |
| parent | 46e3f3075931493f65e9561ef57bcc23fe077a13 (diff) | |
| download | linux-3.10-f6a1f2184c0ea85ad98a4d6e450ad584423d10ce.tar.gz linux-3.10-f6a1f2184c0ea85ad98a4d6e450ad584423d10ce.tar.bz2 linux-3.10-f6a1f2184c0ea85ad98a4d6e450ad584423d10ce.zip | |
Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6
Diffstat (limited to 'drivers/video')
| -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 7cfc170bce1..ca0f6be9d12 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; |