mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-28 15:20:41 +00:00
media: adv7511-v4l2: correctly report EDIDs of 1 block
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 <hverkuil-cisco@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
This commit is contained in:
parent
c730ff32b9
commit
b24bc3ab01
1 changed files with 6 additions and 6 deletions
|
@ -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;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue