summaryrefslogtreecommitdiff
path: root/drivers/video
diff options
context:
space:
mode:
authorPeter Meerwald <pmeerw@pmeerw.net>2015-01-30 10:59:46 +0300
committerTomi Valkeinen <tomi.valkeinen@ti.com>2015-02-04 13:41:53 +0300
commit811fbb1f580ca024a0af603dfaef08a4d1dcb5ef (patch)
tree0a24b979abbe6070764198a9380d533af9f6fbb2 /drivers/video
parenta2408154a14b5633b1f233e4b5fea85c09917eef (diff)
downloadlinux-811fbb1f580ca024a0af603dfaef08a4d1dcb5ef.tar.xz
omapfb: Return error code when applying overlay settings fails
the check of the return code is missing, user space does not get notified about the error condition: omapdss OVERLAY error: overlay 2 horizontally not inside the display area (403 + 800 >= 800) omapdss APPLY error: failed to apply settings: illegal configuration. Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Diffstat (limited to 'drivers/video')
-rw-r--r--drivers/video/fbdev/omap2/omapfb/omapfb-ioctl.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/video/fbdev/omap2/omapfb/omapfb-ioctl.c b/drivers/video/fbdev/omap2/omapfb/omapfb-ioctl.c
index 146b6f5428db..9ddfdd63b84c 100644
--- a/drivers/video/fbdev/omap2/omapfb/omapfb-ioctl.c
+++ b/drivers/video/fbdev/omap2/omapfb/omapfb-ioctl.c
@@ -137,8 +137,11 @@ static int omapfb_setup_plane(struct fb_info *fbi, struct omapfb_plane_info *pi)
goto undo;
}
- if (ovl->manager)
- ovl->manager->apply(ovl->manager);
+ if (ovl->manager) {
+ r = ovl->manager->apply(ovl->manager);
+ if (r)
+ goto undo;
+ }
if (pi->enabled) {
r = ovl->enable(ovl);