Skip to content

Commit

Permalink
OMAP: DSS2: check lock_fb_info() return value
Browse files Browse the repository at this point in the history
Give up if lock_fb_info() fails, following the same convention as other
lock_fb_info() users.

Signed-off-by: Jani Nikula <ext-jani.1.nikula@nokia.com>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@nokia.com>
  • Loading branch information
Jani Nikula authored and Tomi Valkeinen committed May 18, 2010
1 parent 238a413 commit 27b67c9
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 8 deletions.
3 changes: 2 additions & 1 deletion drivers/video/omap2/omapfb/omapfb-ioctl.c
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,8 @@ int omapfb_update_window(struct fb_info *fbi,
struct omapfb2_device *fbdev = ofbi->fbdev;
int r;

lock_fb_info(fbi);
if (!lock_fb_info(fbi))
return -ENODEV;
omapfb_lock(fbdev);

r = omapfb_update_window_nolock(fbi, x, y, w, h);
Expand Down
21 changes: 14 additions & 7 deletions drivers/video/omap2/omapfb/omapfb-sysfs.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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;

Expand Down Expand Up @@ -137,7 +139,8 @@ static ssize_t show_overlays(struct device *dev,
ssize_t l = 0;
int t;

lock_fb_info(fbi);
if (!lock_fb_info(fbi))
return -ENODEV;
omapfb_lock(fbdev);

for (t = 0; t < ofbi->num_overlays; t++) {
Expand Down Expand Up @@ -195,7 +198,8 @@ static ssize_t store_overlays(struct device *dev, struct device_attribute *attr,
if (buf[len - 1] == '\n')
len = len - 1;

lock_fb_info(fbi);
if (!lock_fb_info(fbi))
return -ENODEV;
omapfb_lock(fbdev);

if (len > 0) {
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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) {
Expand Down

0 comments on commit 27b67c9

Please sign in to comment.