diff mbox series

adv7511-v4l2: correctly report EDIDs of 1 block

Message ID 9a769617-f555-f14f-1fea-71152b7c9e8f@xs4all.nl (mailing list archive)
State New, archived
Headers show
Series adv7511-v4l2: correctly report EDIDs of 1 block | expand

Commit Message

Hans Verkuil March 26, 2021, 9:03 a.m. UTC 
If the EDID has an odd number of blocks (usually just 1, but the
same problem occurs with 3 blocks), then VIDIOC_G_EDID reported 2
(or 4) blocks. Fix this.

Signed-off-by: Hans Verkuil <hansverk@cisco.com>
---
 drivers/media/i2c/adv7511-v4l2.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
diff mbox series

Patch

diff --git a/drivers/media/i2c/adv7511-v4l2.c b/drivers/media/i2c/adv7511-v4l2.c
index 9183003ae22d..992db5c79b13 100644
--- a/drivers/media/i2c/adv7511-v4l2.c
+++ b/drivers/media/i2c/adv7511-v4l2.c
@@ -1196,21 +1196,21 @@  static int adv7511_get_edid(struct v4l2_subdev *sd, struct v4l2_edid *edid)
 		return -EINVAL;

 	if (edid->start_block == 0 && edid->blocks == 0) {
-		edid->blocks = state->edid.segments * 2;
+		edid->blocks = state->edid.blocks;
 		return 0;
 	}

-	if (state->edid.segments == 0)
+	if (state->edid.blocks == 0)
 		return -ENODATA;

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

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

 	memcpy(edid->edid, &state->edid.data[edid->start_block * 128],
-			128 * edid->blocks);
+	       128 * edid->blocks);

 	return 0;
 }