OMAP: DSS2: fix lock_fb_info() and omapfb_lock() locking order

Framebuffer ioctl processing forces lock_fb_info() -> omapfb_lock()
locking order. Follow that order to avoid possible circular locking
dependency, detected by lockdep.

Signed-off-by: Jani Nikula <ext-jani.1.nikula@nokia.com>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@nokia.com>

1 files changed, 2 insertions, 2 deletions

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