1 files changed, 6 insertions, 3 deletions

diff --git a/drivers/media/i2c/adv7842.c b/drivers/media/i2c/adv7842.c
index 5d79c57f65d4..06c25c3fa3a9 100644
--- a/drivers/media/i2c/adv7842.c
+++ b/drivers/media/i2c/adv7842.c
@@ -2611,6 +2611,12 @@ static int adv7842_core_init(struct v4l2_subdev *sd)
 
         disable_input(sd);
 
+        /*
+         * Disable I2C access to internal EDID ram from HDMI DDC ports
+         * Disable auto edid enable when leaving powerdown mode
+         */
+        rep_write_and_or(sd, 0x77, 0xd3, 0x20);
+
         /* power */
         io_write(sd, 0x0c, 0x42);   /* Power up part and power down VDP */
         io_write(sd, 0x15, 0x80);   /* Power up pads */
@@ -2691,9 +2697,6 @@ static int adv7842_core_init(struct v4l2_subdev *sd)
 
         enable_input(sd);
 
-        /* disable I2C access to internal EDID ram from HDMI DDC ports */
-        rep_write_and_or(sd, 0x77, 0xf3, 0x00);
-
         if (pdata->hpa_auto) {
                 /* HPA auto, HPA 0.5s after Edid set and Cable detect */
                 hdmi_write(sd, 0x69, 0x5c);