diff options
| author | Hans Verkuil <hans.verkuil@cisco.com> | 2018-10-04 03:58:34 -0400 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab+samsung@kernel.org> | 2018-10-05 11:25:06 -0400 |
| commit | ab83203e181015b099720aff43ffabc1812e0fb3 (patch) | |
| tree | 6a13b6eea9451d550b4364abf4504490bf0ef999 /drivers/media | |
| parent | e7da89926f6dc6cf855f5ffdf79ef99a1b115ca7 (diff) | |
| download | linux-stable-ab83203e181015b099720aff43ffabc1812e0fb3.tar.gz linux-stable-ab83203e181015b099720aff43ffabc1812e0fb3.tar.bz2 linux-stable-ab83203e181015b099720aff43ffabc1812e0fb3.zip | |
media: adv7842: when the EDID is cleared, unconfigure CEC as well
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>
Diffstat (limited to 'drivers/media')
| -rw-r--r-- | drivers/media/i2c/adv7842.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/media/i2c/adv7842.c b/drivers/media/i2c/adv7842.c index cd63cc6564e9..4721d49dcf0f 100644 --- a/drivers/media/i2c/adv7842.c +++ b/drivers/media/i2c/adv7842.c @@ -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 = v4l2_get_edid_phys_addr(edid, 256, &spa_loc); err = v4l2_phys_addr_validate(pa, &pa, NULL); |