Revert "[media] [PATH,1/2] mxl5007 move reset to attach"
authorMauro Carvalho Chehab <mchehab@redhat.com>
Fri, 8 Feb 2013 19:47:01 +0000 (17:47 -0200)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Fri, 8 Feb 2013 19:49:26 +0000 (17:49 -0200)
This patch was applied by mistake. Michael thinks that it
it needs more work than simply moving the soft reset.

So, it should be held back for further review.

This reverts commit 0a3237704dec476be3cdfbe8fc9df9cc65b14442.

Requested by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
drivers/media/tuners/mxl5007t.c

index eb61304c260da3115c3f243e4e3d15f3c034f97f..69e453ef0a1a8631ae3067fb9eb2780fa7768040 100644 (file)
@@ -531,6 +531,10 @@ static int mxl5007t_tuner_init(struct mxl5007t_state *state,
        struct reg_pair_t *init_regs;
        int ret;
 
+       ret = mxl5007t_soft_reset(state);
+       if (mxl_fail(ret))
+               goto fail;
+
        /* calculate initialization reg array */
        init_regs = mxl5007t_calc_init_regs(state, mode);
 
@@ -896,20 +900,7 @@ struct dvb_frontend *mxl5007t_attach(struct dvb_frontend *fe,
                /* existing tuner instance */
                break;
        }
-
-       if (fe->ops.i2c_gate_ctrl)
-               fe->ops.i2c_gate_ctrl(fe, 1);
-
-       ret = mxl5007t_soft_reset(state);
-
-       if (fe->ops.i2c_gate_ctrl)
-               fe->ops.i2c_gate_ctrl(fe, 0);
-
-       if (mxl_fail(ret))
-               goto fail;
-
        fe->tuner_priv = state;
-
        mutex_unlock(&mxl5007t_list_mutex);
 
        memcpy(&fe->ops.tuner_ops, &mxl5007t_tuner_ops,