Commit 6529dcce authored Oct 04, 2018 by Hans Verkuil Committed by Greg Kroah-Hartman Nov 13, 2018

media: adv7842: when the EDID is cleared, unconfigure CEC as well



commit ab83203e181015b099720aff43ffabc1812e0fb3 upstream.

When there is no EDID the CEC adapter should be unconfigured as
well. So call cec_phys_addr_invalidate() when this happens.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Cc: <stable@vger.kernel.org>      # for v4.18 and up
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 3e383b31

drivers/media/i2c/adv7842.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -786,8 +786,10 @@ static int edid_write_hdmi_segment(struct v4l2_subdev *sd, u8 port)
		/* Disable I2C access to internal EDID ram from HDMI DDC ports */
		rep_write_and_or(sd, 0x77, 0xf3, 0x00);

		if (!state->hdmi_edid.present)
		if (!state->hdmi_edid.present) {
		cec_phys_addr_invalidate(state->cec_adap);
		return 0;
		}

		pa = cec_get_edid_phys_addr(edid, 256, &spa_loc);
		err = cec_phys_addr_validate(pa, &pa, NULL);