V4L/DVB (9402): TT S2 3200 shouldn't need Inversion ON and Inversion AUTO at the same time

This is a racy situation.
Inversion is default OFF on the TT S2 3200 hardware,
unlike the KNC1 where it is default Inverted

Signed-off-by: Manu Abraham <manu@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

2 files changed, 4 insertions, 2 deletions

diff --git a/drivers/media/dvb/frontends/stb0899_drv.c b/drivers/media/dvb/frontends/stb0899_drv.c
index db620f02eda9..ce1016eed808 100644
--- a/drivers/media/dvb/frontends/stb0899_drv.c
+++ b/drivers/media/dvb/frontends/stb0899_drv.c
@@ -1886,17 +1886,19 @@ static struct dvb_frontend_ops stb0899_ops = {
 struct dvb_frontend *stb0899_attach(struct stb0899_config *config, struct i2c_adapter *i2c)
 {
         struct stb0899_state *state = NULL;
+        enum stb0899_inversion inversion;
 
         state = kzalloc(sizeof (struct stb0899_state), GFP_KERNEL);
         if (state == NULL)
                 goto error;
 
+        inversion                               = config->inversion;
         state->verbose                          = verbose;
         state->config                           = config;
         state->i2c                              = i2c;
         state->frontend.ops                     = stb0899_ops;
         state->frontend.demodulator_priv        = state;
-        state->internal.inversion               = IQ_SWAP_AUTO;
+        state->internal.inversion               = inversion;
 
         stb0899_wakeup(&state->frontend);
         if (stb0899_get_dev_id(state) == -ENODEV) {
diff --git a/drivers/media/dvb/ttpci/budget-ci.c b/drivers/media/dvb/ttpci/budget-ci.c
index fc4cc491ab59..3e1128cf6dd0 100644
--- a/drivers/media/dvb/ttpci/budget-ci.c
+++ b/drivers/media/dvb/ttpci/budget-ci.c
@@ -1658,7 +1658,7 @@ static struct stb0899_config tt3200_config = {
         .demod_address          = 0x68,
 
         .xtal_freq              = 27000000,
-        .inversion              = IQ_SWAP_ON, /* 1 */
+        .inversion              = IQ_SWAP_OFF, /* 1 */
 
         .esno_ave               = TT3200_DVBS2_ESNO_AVE,
         .esno_quant             = TT3200_DVBS2_ESNO_QUANT,