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

Commit cf9bbea6 authored by Dan Carpenter's avatar Dan Carpenter Committed by Greg Kroah-Hartman
Browse files

drm/panel: type promotion bug in s6e8aa0_read_mtp_id() 



[ Upstream commit cd0e0ca69109d025b1a1b6609f70682db62138b0 ]

The ARRAY_SIZE() macro is type size_t.  If s6e8aa0_dcs_read() returns a
negative error code, then "ret < ARRAY_SIZE(id)" is false because the
negative error code is type promoted to a high positive value.

Fixes: 02051ca0 ("drm/panel: add S6E8AA0 driver")
Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Reviewed-by: default avatarAndrzej Hajda <a.hajda@samsung.com>
Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180704093807.s3lqsb2v6dg2k43d@kili.mountain


Signed-off-by: default avatarSasha Levin <alexander.levin@microsoft.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 32ab7310

drivers/gpu/drm/panel/panel-s6e8aa0.c

+1 −1
Original line number Diff line number Diff line
@@ -835,7 +835,7 @@ static void s6e8aa0_read_mtp_id(struct s6e8aa0 *ctx) 
	int ret, i;



	ret = s6e8aa0_dcs_read(ctx, 0xd1, id, ARRAY_SIZE(id));

	if (ret < ARRAY_SIZE(id) || id[0] == 0x00) {

	if (ret < 0 || ret < ARRAY_SIZE(id) || id[0] == 0x00) {

		dev_err(ctx->dev, "read id failed\n");

		ctx->error = -EIO;

		return;