Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e71ff6f2 authored by Olivier Sobrie's avatar Olivier Sobrie Committed by Florian Tobias Schandinat
Browse files

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: default avatarOlivier Sobrie <olivier@sobrie.be>
Acked-by: default avatarBernie Thompson <bernie@plugable.com>
Signed-off-by: default avatarFlorian Tobias Schandinat <FlorianSchandinat@gmx.de>
parent 33ad3912

drivers/video/udlfb.c

+11 −8
Original line number Diff line number Diff line
@@ -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))

		return -EINVAL;



	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;

}



static ssize_t metrics_reset_store(struct device *fbdev,