V4L/DVB (13332): s5h1409: remove a set register that would cause lock to be lost.

On particularly weak signals, changing register 0xab after setting the
interleave mode will cause the FEC lock to get lost (while still holding the
EQ lock).  So remove the write entirely, which seems to have had no adverse
effect in either of my ClearQAM environments (and in particular resolves the
customer's reported issue).

Also flip around the order of the amhum optimization and the interleave setup
to be consistent with the windows driver, which has the side-benefit of doing
them both in the same call (since the amhum optimization can only be done once
the interleave setup).

This work was sponsored by ONELAN Limited.

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

diff --git a/drivers/media/dvb/frontends/s5h1409.c b/drivers/media/dvb/frontends/s5h1409.c
index 5507159a23b1ca86abc5bcfedb6e49f9e3c67d56..0e2f61a8978ffe3febef2321bd1e2d5fcd790cbf 100644 (file)
--- a/drivers/media/dvb/frontends/s5h1409.c
+++ b/drivers/media/dvb/frontends/s5h1409.c
@@ -586,8 +586,6 @@ static void s5h1409_set_qam_interleave_mode(struct dvb_frontend *fe)
                        s5h1409_writereg(state, 0x96, 0x0020);
                        s5h1409_writereg(state, 0xad,
                                (((reg1 & 0xf000) >> 4) | (reg2 & 0xf0ff)));
-                       s5h1409_writereg(state, 0xab,
-                               s5h1409_readreg(state, 0xab) & 0xeffe);
                        state->qam_state = QAM_STATE_INTERLEAVE_SET;
                }
        } else {
@@ -664,8 +662,8 @@ static int s5h1409_set_frontend(struct dvb_frontend *fe,
                   only do it for the HVR-1600.  Once the other boards are
                   tested, the "legacy" versions can just go away */
                if (state->config->hvr1600_opt == S5H1409_HVR1600_OPTIMIZE) {
-                       s5h1409_set_qam_amhum_mode(fe);
                        s5h1409_set_qam_interleave_mode(fe);
+                       s5h1409_set_qam_amhum_mode(fe);
                } else {
                        s5h1409_set_qam_amhum_mode_legacy(fe);
                        s5h1409_set_qam_interleave_mode_legacy(fe);
@@ -771,8 +769,8 @@ static int s5h1409_read_status(struct dvb_frontend *fe, fe_status_t *status)
                   only do it for the HVR-1600.  Once the other boards are
                   tested, the "legacy" versions can just go away */
                if (state->config->hvr1600_opt == S5H1409_HVR1600_OPTIMIZE) {
-                       s5h1409_set_qam_amhum_mode(fe);
                        s5h1409_set_qam_interleave_mode(fe);
+                       s5h1409_set_qam_amhum_mode(fe);
                }
        }