Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 106774
b: refs/heads/master
c: 74b9ef2
h: refs/heads/master
v: v3
  • Loading branch information
Michael Krufky authored and Mauro Carvalho Chehab committed Jul 27, 2008
1 parent c3454d3 commit 456f062
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 17 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: c39c1fd29373d204b11b71946d0f4c97e4974dd9
refs/heads/master: 74b9ef21162fd81d9de87319c4373f523e2869cd
16 changes: 0 additions & 16 deletions trunk/drivers/media/common/tuners/mxl5007t.c
Original file line number Diff line number Diff line change
Expand Up @@ -663,8 +663,6 @@ static int mxl5007t_get_status(struct dvb_frontend *fe, u32 *status)
if (fe->ops.i2c_gate_ctrl)
fe->ops.i2c_gate_ctrl(fe, 1);

mutex_lock(&state->lock);

ret = mxl5007t_synth_lock_status(state, &rf_locked, &ref_locked);
if (mxl_fail(ret))
goto fail;
Expand All @@ -676,8 +674,6 @@ static int mxl5007t_get_status(struct dvb_frontend *fe, u32 *status)
goto fail;
mxl_debug("rf input power: %d", rf_input_level);
fail:
mutex_unlock(&state->lock);

if (fe->ops.i2c_gate_ctrl)
fe->ops.i2c_gate_ctrl(fe, 0);

Expand Down Expand Up @@ -839,17 +835,13 @@ static int mxl5007t_init(struct dvb_frontend *fe)
if (fe->ops.i2c_gate_ctrl)
fe->ops.i2c_gate_ctrl(fe, 1);

mutex_lock(&state->lock);

ret = mxl5007t_read_reg(state, 0x05, &d);
if (mxl_fail(ret))
goto fail;

ret = mxl5007t_write_reg(state, 0x05, d | 0x01);
mxl_fail(ret);
fail:
mutex_unlock(&state->lock);

if (fe->ops.i2c_gate_ctrl)
fe->ops.i2c_gate_ctrl(fe, 0);

Expand All @@ -865,17 +857,13 @@ static int mxl5007t_sleep(struct dvb_frontend *fe)
if (fe->ops.i2c_gate_ctrl)
fe->ops.i2c_gate_ctrl(fe, 1);

mutex_lock(&state->lock);

ret = mxl5007t_read_reg(state, 0x05, &d);
if (mxl_fail(ret))
goto fail;

ret = mxl5007t_write_reg(state, 0x05, d & ~0x01);
mxl_fail(ret);
fail:
mutex_unlock(&state->lock);

if (fe->ops.i2c_gate_ctrl)
fe->ops.i2c_gate_ctrl(fe, 0);

Expand Down Expand Up @@ -1001,12 +989,8 @@ struct dvb_frontend *mxl5007t_attach(struct dvb_frontend *fe,
if (fe->ops.i2c_gate_ctrl)
fe->ops.i2c_gate_ctrl(fe, 1);

mutex_lock(&state->lock);

ret = mxl5007t_get_chip_id(state);

mutex_unlock(&state->lock);

if (fe->ops.i2c_gate_ctrl)
fe->ops.i2c_gate_ctrl(fe, 0);

Expand Down

0 comments on commit 456f062

Please sign in to comment.