diff options
| author |   Stefan Schmidt <stefan@datenfreihafen.org> | 2009-03-23 11:45:40 +0100 |
|---|---|---|
| committer | Stefan Schmidt <stefan@datenfreihafen.org> | 2009-03-23 11:45:40 +0100 |
| commit | 451b1c687105655a4f2c9c477b05535041e25060 (patch) | |
| tree | 3db315590172cd6244107a97a6603add934d7e32 /recipes/linux/linux-omap/0011-DSS-OMAPFB-fix-GFX_SYNC-to-be-compatible-with-DSS1.patch | |
| parent | 6767ca50430e37cdad0a8992b73c3f82ead134bf (diff) | |
| parent | e2b99b79f516a7466dc050902cee62f39869bf9d (diff) | |
| download | openembedded-451b1c687105655a4f2c9c477b05535041e25060.tar.gz | |
Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev
Diffstat (limited to 'recipes/linux/linux-omap/0011-DSS-OMAPFB-fix-GFX_SYNC-to-be-compatible-with-DSS1.patch')
| -rw-r--r-- | recipes/linux/linux-omap/0011-DSS-OMAPFB-fix-GFX_SYNC-to-be-compatible-with-DSS1.patch | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/recipes/linux/linux-omap/0011-DSS-OMAPFB-fix-GFX_SYNC-to-be-compatible-with-DSS1.patch b/recipes/linux/linux-omap/0011-DSS-OMAPFB-fix-GFX_SYNC-to-be-compatible-with-DSS1.patch new file mode 100644 index 0000000000..8d4165ac7a --- /dev/null +++ b/recipes/linux/linux-omap/0011-DSS-OMAPFB-fix-GFX_SYNC-to-be-compatible-with-DSS1.patch @@ -0,0 +1,27 @@ +From 36d6e7edd70d16ad57ed745a1c48694805035dc7 Mon Sep 17 00:00:00 2001 +From: Tomi Valkeinen <tomi.valkeinen@nokia.com> +Date: Wed, 7 Jan 2009 17:17:08 +0200 +Subject: [PATCH] OMAPFB: fix GFX_SYNC to be compatible with DSS1 + +DSS1 never returned an error from GFX_SYNC ioctl. So we neither. +--- + drivers/video/omap2/omapfb-ioctl.c | 3 ++- + 1 files changed, 2 insertions(+), 1 deletions(-) + +diff --git a/drivers/video/omap2/omapfb-ioctl.c b/drivers/video/omap2/omapfb-ioctl.c +index bb5f791..0cb0370 100644 +--- a/drivers/video/omap2/omapfb-ioctl.c ++++ b/drivers/video/omap2/omapfb-ioctl.c +@@ -314,7 +314,8 @@ int omapfb_ioctl(struct fb_info *fbi, unsigned int cmd, unsigned long arg) + switch (cmd) { + case OMAPFB_SYNC_GFX: + if (!display || !display->sync) { +- r = -EINVAL; ++ /* DSS1 never returns an error here, so we neither */ ++ /*r = -EINVAL;*/ + break; + } + +-- +1.5.6.3 + |