aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2013-02-08 14:47:01 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2013-02-08 14:49:26 -0500
commitdb5c05b2a1c02e401778de348451bae49b65806e (patch)
tree71a22961f1af8d99fdec095f2c345215a6dd330e /drivers/media
parent0917a60430cdd4b5d3505c240a04bb0f5927c74b (diff)
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.c17
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,
531 struct reg_pair_t *init_regs; 531 struct reg_pair_t *init_regs;
532 int ret; 532 int ret;
533 533
534 ret = mxl5007t_soft_reset(state);
535 if (mxl_fail(ret))
536 goto fail;
537
534 /* calculate initialization reg array */ 538 /* calculate initialization reg array */
535 init_regs = mxl5007t_calc_init_regs(state, mode); 539 init_regs = mxl5007t_calc_init_regs(state, mode);
536 540
@@ -896,20 +900,7 @@ struct dvb_frontend *mxl5007t_attach(struct dvb_frontend *fe,
896 /* existing tuner instance */ 900 /* existing tuner instance */
897 break; 901 break;
898 } 902 }
899
900 if (fe->ops.i2c_gate_ctrl)
901 fe->ops.i2c_gate_ctrl(fe, 1);
902
903 ret = mxl5007t_soft_reset(state);
904
905 if (fe->ops.i2c_gate_ctrl)
906 fe->ops.i2c_gate_ctrl(fe, 0);
907
908 if (mxl_fail(ret))
909 goto fail;
910
911 fe->tuner_priv = state; 903 fe->tuner_priv = state;
912
913 mutex_unlock(&mxl5007t_list_mutex); 904 mutex_unlock(&mxl5007t_list_mutex);
914 905
915 memcpy(&fe->ops.tuner_ops, &mxl5007t_tuner_ops, 906 memcpy(&fe->ops.tuner_ops, &mxl5007t_tuner_ops,