From: Mats Randgaard Date: Wed, 14 Aug 2013 12:23:48 +0000 (-0300) Subject: [media] ad9389b: no monitor if EDID is wrong X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=7be4f888112eeebd7ce33bca49b3a1df1fd52295;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git [media] ad9389b: no monitor if EDID is wrong state->have_monitor is set to false if the EDID that is read from the monitor has too many segments or wrong CRC. Signed-off-by: Mats Randgaard Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/media/i2c/ad9389b.c b/drivers/media/i2c/ad9389b.c index 7e68d8f9676f..52384e83cde9 100644 --- a/drivers/media/i2c/ad9389b.c +++ b/drivers/media/i2c/ad9389b.c @@ -1019,6 +1019,7 @@ static bool ad9389b_check_edid_status(struct v4l2_subdev *sd) segment = ad9389b_rd(sd, 0xc4); if (segment >= EDID_MAX_SEGM) { v4l2_err(sd, "edid segment number too big\n"); + state->have_monitor = false; return false; } v4l2_dbg(1, debug, sd, "%s: got segment %d\n", __func__, segment); @@ -1032,6 +1033,8 @@ static bool ad9389b_check_edid_status(struct v4l2_subdev *sd) } if (!edid_segment_verify_crc(sd, segment)) { /* edid crc error, force reread of edid segment */ + v4l2_err(sd, "%s: edid crc error\n", __func__); + state->have_monitor = false; ad9389b_s_power(sd, false); ad9389b_s_power(sd, true); return false;