From e71ff6f265c80b6f04f1d16470b5afa58f0b4648 Mon Sep 17 00:00:00 2001 From: Olivier Sobrie Date: Wed, 29 Feb 2012 08:06:40 +0100 Subject: [PATCH] udlfb: Fix invalid return codes in edid sysfs entry store function 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 Acked-by: Bernie Thompson Signed-off-by: Florian Tobias Schandinat --- drivers/video/udlfb.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/drivers/video/udlfb.c b/drivers/video/udlfb.c index 86c8b25..157df78 100644 --- a/drivers/video/udlfb.c +++ b/drivers/video/udlfb.c @@ -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, -- 2.7.4