diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2013-02-08 20:47:01 +0100 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2013-02-08 20:49:26 +0100 |
| commit | db5c05b2a1c02e401778de348451bae49b65806e (patch) | |
| tree | 71a22961f1af8d99fdec095f2c345215a6dd330e /drivers/media | |
| parent | [media] fc0011: fp/fa value overflow fix (diff) | |
| download | linux-db5c05b2a1c02e401778de348451bae49b65806e.tar.xz linux-db5c05b2a1c02e401778de348451bae49b65806e.zip | |
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 0a3237704dec476be3cdfbe8fc9df9cc65b14442.
Requested by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media')
| -rw-r--r-- | drivers/media/tuners/mxl5007t.c | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/drivers/media/tuners/mxl5007t.c b/drivers/media/tuners/mxl5007t.c index eb61304c260d..69e453ef0a1a 100644 --- a/drivers/media/tuners/mxl5007t.c +++ b/drivers/media/tuners/mxl5007t.c @@ -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, |