diff options
author | Michael Krufky <mkrufky@linuxtv.org> | 2008-05-03 17:20:21 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-05-14 01:54:04 -0400 |
commit | d35fccaffd095e79691cd07a49a36867cb275b72 (patch) | |
tree | a9b6995cc39827cf486c70e6b3aab1ca11df8a57 /drivers/media/common/tuners/tda18271-common.c | |
parent | dc9d522a1358bfb87e9ed8718cc1e4d5141a5468 (diff) |
V4L/DVB (7837): tda18271: fix error handling in init and sleep paths
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/common/tuners/tda18271-common.c')
-rw-r--r-- | drivers/media/common/tuners/tda18271-common.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/media/common/tuners/tda18271-common.c b/drivers/media/common/tuners/tda18271-common.c index e27a7620a32f..9001d422cc1c 100644 --- a/drivers/media/common/tuners/tda18271-common.c +++ b/drivers/media/common/tuners/tda18271-common.c | |||
@@ -227,9 +227,8 @@ int tda18271_charge_pump_source(struct dvb_frontend *fe, | |||
227 | 227 | ||
228 | regs[r_cp] &= ~0x20; | 228 | regs[r_cp] &= ~0x20; |
229 | regs[r_cp] |= ((force & 1) << 5); | 229 | regs[r_cp] |= ((force & 1) << 5); |
230 | tda18271_write_regs(fe, r_cp, 1); | ||
231 | 230 | ||
232 | return 0; | 231 | return tda18271_write_regs(fe, r_cp, 1); |
233 | } | 232 | } |
234 | 233 | ||
235 | int tda18271_init_regs(struct dvb_frontend *fe) | 234 | int tda18271_init_regs(struct dvb_frontend *fe) |
@@ -494,9 +493,7 @@ int tda18271_set_standby_mode(struct dvb_frontend *fe, | |||
494 | sm_lt ? (1 << 6) : 0 | | 493 | sm_lt ? (1 << 6) : 0 | |
495 | sm_xt ? (1 << 5) : 0; | 494 | sm_xt ? (1 << 5) : 0; |
496 | 495 | ||
497 | tda18271_write_regs(fe, R_EP3, 1); | 496 | return tda18271_write_regs(fe, R_EP3, 1); |
498 | |||
499 | return 0; | ||
500 | } | 497 | } |
501 | 498 | ||
502 | /*---------------------------------------------------------------------*/ | 499 | /*---------------------------------------------------------------------*/ |