提交 db5c05b2 编写于 作者: M Mauro Carvalho Chehab

Revert "[media] [PATH,1/2] mxl5007 move reset to attach"

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 0a323770.

Requested by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: NMauro Carvalho Chehab <mchehab@redhat.com>
上级 0917a604
...@@ -531,6 +531,10 @@ static int mxl5007t_tuner_init(struct mxl5007t_state *state, ...@@ -531,6 +531,10 @@ static int mxl5007t_tuner_init(struct mxl5007t_state *state,
struct reg_pair_t *init_regs; struct reg_pair_t *init_regs;
int ret; int ret;
ret = mxl5007t_soft_reset(state);
if (mxl_fail(ret))
goto fail;
/* calculate initialization reg array */ /* calculate initialization reg array */
init_regs = mxl5007t_calc_init_regs(state, mode); init_regs = mxl5007t_calc_init_regs(state, mode);
...@@ -896,20 +900,7 @@ struct dvb_frontend *mxl5007t_attach(struct dvb_frontend *fe, ...@@ -896,20 +900,7 @@ struct dvb_frontend *mxl5007t_attach(struct dvb_frontend *fe,
/* existing tuner instance */ /* existing tuner instance */
break; 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; fe->tuner_priv = state;
mutex_unlock(&mxl5007t_list_mutex); mutex_unlock(&mxl5007t_list_mutex);
memcpy(&fe->ops.tuner_ops, &mxl5007t_tuner_ops, memcpy(&fe->ops.tuner_ops, &mxl5007t_tuner_ops,
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册