[media] au8522: fix intermittent lockup of analog video decoder

It turns up the autodetection for the video standard in the au8522 is
prone to hanging the chip until a reset is performed.  This condition is
trivial to reproduce simply by tuning to a station and then rapidly
unplugging/ replugging the coax feed.

Because we've never claimed to support anything other than NTSC-M, just
disable the video-standard autodetection logic and force it to always be
NTSC-M.

Signed-off-by: Devin Heitmueller <dheitmueller@kernellabs.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

1 files changed, 4 insertions, 2 deletions

diff --git a/drivers/media/dvb/frontends/au8522_decoder.c b/drivers/media/dvb/frontends/au8522_decoder.c
index 55b6390198e3..f2e786b606fd 100644
--- a/drivers/media/dvb/frontends/au8522_decoder.c
+++ b/drivers/media/dvb/frontends/au8522_decoder.c
@@ -257,9 +257,11 @@ static void setup_decoder_defaults(struct au8522_state *state, u8 input_mode)
         au8522_writereg(state, AU8522_TVDED_DBG_MODE_REG060H,
                         AU8522_TVDED_DBG_MODE_REG060H_CVBS);
         au8522_writereg(state, AU8522_TVDEC_FORMAT_CTRL1_REG061H,
-                        AU8522_TVDEC_FORMAT_CTRL1_REG061H_CVBS13);
+                        AU8522_TVDEC_FORMAT_CTRL1_REG061H_FIELD_LEN_525 |
+                        AU8522_TVDEC_FORMAT_CTRL1_REG061H_LINE_LEN_63_492 |
+                        AU8522_TVDEC_FORMAT_CTRL1_REG061H_SUBCARRIER_NTSC_MN);
         au8522_writereg(state, AU8522_TVDEC_FORMAT_CTRL2_REG062H,
-                        AU8522_TVDEC_FORMAT_CTRL2_REG062H_CVBS13);
+                        AU8522_TVDEC_FORMAT_CTRL2_REG062H_STD_NTSC);
         au8522_writereg(state, AU8522_TVDEC_VCR_DET_LLIM_REG063H,
                         AU8522_TVDEC_VCR_DET_LLIM_REG063H_CVBS);
         au8522_writereg(state, AU8522_TVDEC_VCR_DET_HLIM_REG064H,