Skip to content

Commit

Permalink
udlfb: Fix invalid return codes in edid sysfs entry store function
Browse files Browse the repository at this point in the history
Return a negative errno instead of zero in the write function of
the sysfs entry in case of error.
Also add a check on the return value of dlfb_setup_modes().

Signed-off-by: Olivier Sobrie <olivier@sobrie.be>
Acked-by: Bernie Thompson <bernie@plugable.com>
Signed-off-by: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
  • Loading branch information
oso authored and schandinat committed Mar 8, 2012
1 parent 33ad391 commit e71ff6f
Showing 1 changed file with 11 additions and 8 deletions.
19 changes: 11 additions & 8 deletions drivers/video/udlfb.c
Original file line number Diff line number Diff line change
@@ -1432,19 +1432,22 @@ static ssize_t edid_store(
struct device *fbdev = container_of(kobj, struct device, kobj);
struct fb_info *fb_info = dev_get_drvdata(fbdev);
struct dlfb_data *dev = fb_info->par;
int ret;

/* We only support write of entire EDID at once, no offset*/
if ((src_size != EDID_LENGTH) || (src_off != 0))
return 0;
return -EINVAL;

dlfb_setup_modes(dev, fb_info, src, src_size);
ret = dlfb_setup_modes(dev, fb_info, src, src_size);
if (ret)
return ret;

if (dev->edid && (memcmp(src, dev->edid, src_size) == 0)) {
pr_info("sysfs written EDID is new default\n");
dlfb_ops_set_par(fb_info);
return src_size;
} else
return 0;
if (!dev->edid || memcmp(src, dev->edid, src_size))
return -EINVAL;

pr_info("sysfs written EDID is new default\n");
dlfb_ops_set_par(fb_info);
return src_size;
}

static ssize_t metrics_reset_store(struct device *fbdev,

0 comments on commit e71ff6f

Please sign in to comment.