1 files changed, 16 insertions, 9 deletions

diff --git a/drivers/video/omap2/omapfb/omapfb-sysfs.c b/drivers/video/omap2/omapfb/omapfb-sysfs.c
index 62bb88f5c192..5179219128bd 100644
--- a/drivers/video/omap2/omapfb/omapfb-sysfs.c
+++ b/drivers/video/omap2/omapfb/omapfb-sysfs.c
@@ -57,7 +57,8 @@ static ssize_t store_rotate_type(struct device *dev,
         if (rot_type != OMAP_DSS_ROT_DMA && rot_type != OMAP_DSS_ROT_VRFB)
                 return -EINVAL;
 
-        lock_fb_info(fbi);
+        if (!lock_fb_info(fbi))
+                return -ENODEV;
 
         r = 0;
         if (rot_type == ofbi->rotation_type)
@@ -105,7 +106,8 @@ static ssize_t store_mirror(struct device *dev,
         if (mirror != 0 && mirror != 1)
                 return -EINVAL;
 
-        lock_fb_info(fbi);
+        if (!lock_fb_info(fbi))
+                return -ENODEV;
 
         ofbi->mirror = mirror;
 
@@ -137,8 +139,9 @@ static ssize_t show_overlays(struct device *dev,
         ssize_t l = 0;
         int t;
 
+        if (!lock_fb_info(fbi))
+                return -ENODEV;
         omapfb_lock(fbdev);
-        lock_fb_info(fbi);
 
         for (t = 0; t < ofbi->num_overlays; t++) {
                 struct omap_overlay *ovl = ofbi->overlays[t];
@@ -154,8 +157,8 @@ static ssize_t show_overlays(struct device *dev,
 
         l += snprintf(buf + l, PAGE_SIZE - l, "\n");
 
-        unlock_fb_info(fbi);
         omapfb_unlock(fbdev);
+        unlock_fb_info(fbi);
 
         return l;
 }
@@ -195,8 +198,9 @@ static ssize_t store_overlays(struct device *dev, struct device_attribute *attr,
         if (buf[len - 1] == '\n')
                 len = len - 1;
 
+        if (!lock_fb_info(fbi))
+                return -ENODEV;
         omapfb_lock(fbdev);
-        lock_fb_info(fbi);
 
         if (len > 0) {
                 char *p = (char *)buf;
@@ -303,8 +307,8 @@ static ssize_t store_overlays(struct device *dev, struct device_attribute *attr,
 
         r = count;
 out:
-        unlock_fb_info(fbi);
         omapfb_unlock(fbdev);
+        unlock_fb_info(fbi);
 
         return r;
 }
@@ -317,7 +321,8 @@ static ssize_t show_overlays_rotate(struct device *dev,
         ssize_t l = 0;
         int t;
 
-        lock_fb_info(fbi);
+        if (!lock_fb_info(fbi))
+                return -ENODEV;
 
         for (t = 0; t < ofbi->num_overlays; t++) {
                 l += snprintf(buf + l, PAGE_SIZE - l, "%s%d",
@@ -345,7 +350,8 @@ static ssize_t store_overlays_rotate(struct device *dev,
         if (buf[len - 1] == '\n')
                 len = len - 1;
 
-        lock_fb_info(fbi);
+        if (!lock_fb_info(fbi))
+                return -ENODEV;
 
         if (len > 0) {
                 char *p = (char *)buf;
@@ -416,7 +422,8 @@ static ssize_t store_size(struct device *dev, struct device_attribute *attr,
 
         size = PAGE_ALIGN(simple_strtoul(buf, NULL, 0));
 
-        lock_fb_info(fbi);
+        if (!lock_fb_info(fbi))
+                return -ENODEV;
 
         for (i = 0; i < ofbi->num_overlays; i++) {
                 if (ofbi->overlays[i]->info.enabled) {