1 files changed, 13 insertions, 0 deletions

diff --git a/drivers/media/video/cx18/cx18-driver.c b/drivers/media/video/cx18/cx18-driver.c
index 0f13fdd890a4..1518a58e17fc 100644
--- a/drivers/media/video/cx18/cx18-driver.c
+++ b/drivers/media/video/cx18/cx18-driver.c
@@ -1080,6 +1080,19 @@ int cx18_init_on_first_open(struct cx18 *cx)
                 return -ENXIO;
         }
 
+        /*
+         * The second firmware load requires us to normalize the APU state,
+         * or the audio for the first analog capture will be badly incorrect.
+         *
+         * I can't seem to call APU_RESETAI and have it succeed without the
+         * APU capturing audio, so we start and stop it here to do the reset
+         */
+
+        /* MPEG Encoding, 224 kbps, MPEG Layer II, 48 ksps */
+        cx18_vapi(cx, CX18_APU_START, 2, CX18_APU_ENCODING_METHOD_MPEG|0xb9, 0);
+        cx18_vapi(cx, CX18_APU_RESETAI, 0);
+        cx18_vapi(cx, CX18_APU_STOP, 1, CX18_APU_ENCODING_METHOD_MPEG);
+
         vf.tuner = 0;
         vf.type = V4L2_TUNER_ANALOG_TV;
         vf.frequency = 6400; /* the tuner 'baseline' frequency */