Commit c81285ae authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

[media] adv7511: fix G/S_EDID behavior 



This fixes the v4l2-compliance failures.

Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent c909e5ba

drivers/media/i2c/adv7511.c

+14 −7
Original line number Original line Diff line number Diff line
@@ -779,21 +779,28 @@ static int adv7511_get_edid(struct v4l2_subdev *sd, struct v4l2_edid *edid) 
{

{

	struct adv7511_state *state = get_adv7511_state(sd);

	struct adv7511_state *state = get_adv7511_state(sd);





	memset(edid->reserved, 0, sizeof(edid->reserved));



	if (edid->pad != 0)

	if (edid->pad != 0)

		return -EINVAL;

		return -EINVAL;

	if ((edid->blocks == 0) || (edid->blocks > 256))



		return -EINVAL;

	if (edid->start_block == 0 && edid->blocks == 0) {

	if (!state->edid.segments) {

		edid->blocks = state->edid.segments * 2;

		v4l2_dbg(1, debug, sd, "EDID segment 0 not found\n");

		return 0;

		return -ENODATA;

	}

	}



	if (state->edid.segments == 0)

		return -ENODATA;



	if (edid->start_block >= state->edid.segments * 2)

	if (edid->start_block >= state->edid.segments * 2)

		return -E2BIG;

		return -EINVAL;

	if ((edid->blocks + edid->start_block) >= state->edid.segments * 2)



	if (edid->start_block + edid->blocks > state->edid.segments * 2)

		edid->blocks = state->edid.segments * 2 - edid->start_block;

		edid->blocks = state->edid.segments * 2 - edid->start_block;





	memcpy(edid->edid, &state->edid.data[edid->start_block * 128],

	memcpy(edid->edid, &state->edid.data[edid->start_block * 128],

			128 * edid->blocks);

			128 * edid->blocks);



	return 0;

	return 0;

}

}