Commit 27b67c92 authored by Jani Nikula's avatar Jani Nikula Committed by Tomi Valkeinen

OMAP: DSS2: check lock_fb_info() return value

Give up if lock_fb_info() fails, following the same convention as other
lock_fb_info() users.
Signed-off-by: default avatarJani Nikula <ext-jani.1.nikula@nokia.com>
Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@nokia.com>
parent 238a4132
...@@ -183,7 +183,8 @@ int omapfb_update_window(struct fb_info *fbi, ...@@ -183,7 +183,8 @@ int omapfb_update_window(struct fb_info *fbi,
struct omapfb2_device *fbdev = ofbi->fbdev; struct omapfb2_device *fbdev = ofbi->fbdev;
int r; int r;
lock_fb_info(fbi); if (!lock_fb_info(fbi))
return -ENODEV;
omapfb_lock(fbdev); omapfb_lock(fbdev);
r = omapfb_update_window_nolock(fbi, x, y, w, h); r = omapfb_update_window_nolock(fbi, x, y, w, h);
......
...@@ -57,7 +57,8 @@ static ssize_t store_rotate_type(struct device *dev, ...@@ -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) if (rot_type != OMAP_DSS_ROT_DMA && rot_type != OMAP_DSS_ROT_VRFB)
return -EINVAL; return -EINVAL;
lock_fb_info(fbi); if (!lock_fb_info(fbi))
return -ENODEV;
r = 0; r = 0;
if (rot_type == ofbi->rotation_type) if (rot_type == ofbi->rotation_type)
...@@ -105,7 +106,8 @@ static ssize_t store_mirror(struct device *dev, ...@@ -105,7 +106,8 @@ static ssize_t store_mirror(struct device *dev,
if (mirror != 0 && mirror != 1) if (mirror != 0 && mirror != 1)
return -EINVAL; return -EINVAL;
lock_fb_info(fbi); if (!lock_fb_info(fbi))
return -ENODEV;
ofbi->mirror = mirror; ofbi->mirror = mirror;
...@@ -137,7 +139,8 @@ static ssize_t show_overlays(struct device *dev, ...@@ -137,7 +139,8 @@ static ssize_t show_overlays(struct device *dev,
ssize_t l = 0; ssize_t l = 0;
int t; int t;
lock_fb_info(fbi); if (!lock_fb_info(fbi))
return -ENODEV;
omapfb_lock(fbdev); omapfb_lock(fbdev);
for (t = 0; t < ofbi->num_overlays; t++) { for (t = 0; t < ofbi->num_overlays; t++) {
...@@ -195,7 +198,8 @@ static ssize_t store_overlays(struct device *dev, struct device_attribute *attr, ...@@ -195,7 +198,8 @@ static ssize_t store_overlays(struct device *dev, struct device_attribute *attr,
if (buf[len - 1] == '\n') if (buf[len - 1] == '\n')
len = len - 1; len = len - 1;
lock_fb_info(fbi); if (!lock_fb_info(fbi))
return -ENODEV;
omapfb_lock(fbdev); omapfb_lock(fbdev);
if (len > 0) { if (len > 0) {
...@@ -317,7 +321,8 @@ static ssize_t show_overlays_rotate(struct device *dev, ...@@ -317,7 +321,8 @@ static ssize_t show_overlays_rotate(struct device *dev,
ssize_t l = 0; ssize_t l = 0;
int t; int t;
lock_fb_info(fbi); if (!lock_fb_info(fbi))
return -ENODEV;
for (t = 0; t < ofbi->num_overlays; t++) { for (t = 0; t < ofbi->num_overlays; t++) {
l += snprintf(buf + l, PAGE_SIZE - l, "%s%d", l += snprintf(buf + l, PAGE_SIZE - l, "%s%d",
...@@ -345,7 +350,8 @@ static ssize_t store_overlays_rotate(struct device *dev, ...@@ -345,7 +350,8 @@ static ssize_t store_overlays_rotate(struct device *dev,
if (buf[len - 1] == '\n') if (buf[len - 1] == '\n')
len = len - 1; len = len - 1;
lock_fb_info(fbi); if (!lock_fb_info(fbi))
return -ENODEV;
if (len > 0) { if (len > 0) {
char *p = (char *)buf; char *p = (char *)buf;
...@@ -416,7 +422,8 @@ static ssize_t store_size(struct device *dev, struct device_attribute *attr, ...@@ -416,7 +422,8 @@ static ssize_t store_size(struct device *dev, struct device_attribute *attr,
size = PAGE_ALIGN(simple_strtoul(buf, NULL, 0)); 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++) { for (i = 0; i < ofbi->num_overlays; i++) {
if (ofbi->overlays[i]->info.enabled) { if (ofbi->overlays[i]->info.enabled) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment