Skip to content

Commit

Permalink
Revert "[media] [PATH,1/2] mxl5007 move reset to attach"
Browse files Browse the repository at this point in the history
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 0a32377.

Requested by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
  • Loading branch information
Mauro Carvalho Chehab committed Feb 8, 2013
1 parent 0917a60 commit db5c05b
Showing 1 changed file with 4 additions and 13 deletions.
17 changes: 4 additions & 13 deletions drivers/media/tuners/mxl5007t.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down Expand Up @@ -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,
Expand Down

0 comments on commit db5c05b

Please sign in to comment.