From c61e5c79129c0bfd4a4659347d011c91cc98f28f Mon Sep 17 00:00:00 2001 From: Archit Taneja Date: Mon, 10 Sep 2012 14:43:39 +0530 Subject: [PATCH] --- yaml --- r: 333591 b: refs/heads/master c: 952cbaaa9b8beacc425f9aedf370468cbb737a2c h: refs/heads/master i: 333589: 1df0fb762b1ce4f6e4ad54ce8f07b5d0bdbce3e3 333587: 04e86a8e58db47ece138c96cce7a320444a4a830 333583: 10335413c7eec57932fe4a5a0b6c23ec2404c929 v: v3 --- [refs] | 2 +- trunk/drivers/video/omap2/omapfb/omapfb-ioctl.c | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index dd9d1cb1c498..6d56a383d284 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cea87b92da825f24efd11112d414f6c8cdd4ced8 +refs/heads/master: 952cbaaa9b8beacc425f9aedf370468cbb737a2c diff --git a/trunk/drivers/video/omap2/omapfb/omapfb-ioctl.c b/trunk/drivers/video/omap2/omapfb/omapfb-ioctl.c index c6cf372d22c5..606b89f12351 100644 --- a/trunk/drivers/video/omap2/omapfb/omapfb-ioctl.c +++ b/trunk/drivers/video/omap2/omapfb/omapfb-ioctl.c @@ -599,6 +599,7 @@ int omapfb_ioctl(struct fb_info *fbi, unsigned int cmd, unsigned long arg) struct omapfb_info *ofbi = FB2OFB(fbi); struct omapfb2_device *fbdev = ofbi->fbdev; struct omap_dss_device *display = fb2display(fbi); + struct omap_overlay_manager *mgr; union { struct omapfb_update_window_old uwnd_o; @@ -786,12 +787,14 @@ int omapfb_ioctl(struct fb_info *fbi, unsigned int cmd, unsigned long arg) case OMAPFB_WAITFORVSYNC: DBG("ioctl WAITFORVSYNC\n"); - if (!display) { + if (!display && !display->output && !display->output->manager) { r = -EINVAL; break; } - r = display->manager->wait_for_vsync(display->manager); + mgr = display->output->manager; + + r = mgr->wait_for_vsync(mgr); break; case OMAPFB_WAITFORGO: