1 files changed, 3 insertions, 2 deletions

diff --git a/drivers/video/omap2/omapfb/omapfb-ioctl.c b/drivers/video/omap2/omapfb/omapfb-ioctl.c
index 1ffa760b8545..9c7361871d78 100644
--- a/drivers/video/omap2/omapfb/omapfb-ioctl.c
+++ b/drivers/video/omap2/omapfb/omapfb-ioctl.c
@@ -183,13 +183,14 @@ int omapfb_update_window(struct fb_info *fbi,
         struct omapfb2_device *fbdev = ofbi->fbdev;
         int r;
 
+        if (!lock_fb_info(fbi))
+                return -ENODEV;
         omapfb_lock(fbdev);
-        lock_fb_info(fbi);
 
         r = omapfb_update_window_nolock(fbi, x, y, w, h);
 
-        unlock_fb_info(fbi);
         omapfb_unlock(fbdev);
+        unlock_fb_info(fbi);
 
         return r;
 }