Skip to content

Commit

Permalink
V4L/DVB (7841): tda18271: fix error handling in tda18271_channel_conf…
Browse files Browse the repository at this point in the history
…iguration

Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
  • Loading branch information
Michael Krufky authored and Mauro Carvalho Chehab committed May 14, 2008
1 parent 9c41d45 commit 31940e3
Showing 1 changed file with 14 additions and 7 deletions.
21 changes: 14 additions & 7 deletions drivers/media/common/tuners/tda18271-fe.c
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ static int tda18271_channel_configuration(struct dvb_frontend *fe,
{
struct tda18271_priv *priv = fe->tuner_priv;
unsigned char *regs = priv->tda18271_regs;
int ret;
u32 N;

/* update TV broadcast parameters */
Expand Down Expand Up @@ -85,7 +86,9 @@ static int tda18271_channel_configuration(struct dvb_frontend *fe,
/* update rf top / if top */
regs[R_EB22] = 0x00;
regs[R_EB22] |= map->rfagc_top;
tda18271_write_regs(fe, R_EB22, 1);
ret = tda18271_write_regs(fe, R_EB22, 1);
if (ret < 0)
goto fail;

/* --------------------------------------------------------------- */

Expand Down Expand Up @@ -121,7 +124,9 @@ static int tda18271_channel_configuration(struct dvb_frontend *fe,
/* agc1 has priority on agc2 */
regs[R_EB1] &= ~0x01;

tda18271_write_regs(fe, R_EB1, 1);
ret = tda18271_write_regs(fe, R_EB1, 1);
if (ret < 0)
goto fail;

/* --------------------------------------------------------------- */

Expand All @@ -141,7 +146,9 @@ static int tda18271_channel_configuration(struct dvb_frontend *fe,
break;
}

tda18271_write_regs(fe, R_TM, 7);
ret = tda18271_write_regs(fe, R_TM, 7);
if (ret < 0)
goto fail;

/* force charge pump source */
charge_pump_source(fe, 1);
Expand All @@ -158,9 +165,9 @@ static int tda18271_channel_configuration(struct dvb_frontend *fe,
regs[R_EP3] &= ~0x04;
else
regs[R_EP3] |= 0x04;
tda18271_write_regs(fe, R_EP3, 1);

return 0;
ret = tda18271_write_regs(fe, R_EP3, 1);
fail:
return ret;
}

static int tda18271_read_thermometer(struct dvb_frontend *fe)
Expand Down Expand Up @@ -813,7 +820,7 @@ static int tda18271_tune(struct dvb_frontend *fe,
tda18271c2_rf_tracking_filters_correction(fe, freq);
break;
}
tda18271_channel_configuration(fe, map, freq, bw);
ret = tda18271_channel_configuration(fe, map, freq, bw);

mutex_unlock(&priv->lock);
fail:
Expand Down

0 comments on commit 31940e3

Please sign in to comment.