media: tda1997x: fix get_edid

set_edid never wrote the new EDID to state->edid.edid, it was only
written to the hardware. Since get_edid returned state->edid.edid,
it was never returning the right EDID.

Signed-off-by: Tim Harvey <tharvey@gateworks.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
[hverkuil-cisco@xs4all.nl: added missing commit log]
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>

diff --git a/drivers/media/i2c/tda1997x.c b/drivers/media/i2c/tda1997x.c
index e8613e364403c9809a33ddcc7c3611efd8445632..a62ede0966361a879e33db7c3f1e1ad5d207d4c0 100644 (file)
--- a/drivers/media/i2c/tda1997x.c
+++ b/drivers/media/i2c/tda1997x.c
@@ -1884,6 +1884,10 @@ static int tda1997x_set_edid(struct v4l2_subdev *sd, struct v4l2_edid *edid)
        for (i = 0; i < 128; i++)
                io_write(sd, REG_EDID_IN_BYTE128 + i, edid->edid[i+128]);
 
+       /* store state */
+       memcpy(state->edid.edid, edid->edid, 256);
+       state->edid.blocks = edid->blocks;
+
        tda1997x_enable_edid(sd);
 
        return 0;