diff options
author | Adrian Bunk <bunk@stusta.de> | 2007-07-27 10:09:57 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-07-30 15:26:37 -0400 |
commit | 4bc4365291bc27798d760c87f3aada39d9a74f43 (patch) | |
tree | 9f089bd5595a583671b7dfbb1eb5d90df1d6dfd3 /drivers/media/dvb/dvb-usb/af9005-fe.c | |
parent | 639ffd2d9038d34725b752147a0f1a8536146851 (diff) |
V4L/DVB (5933): Dvb-usb/af9005-fe.c: error check fixes
This patch:
- adds a missing error check and
- removes an error check that could never be true
Both spotted by the Coverity checker.
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Acked-by: Luca Olivetti <luca@ventoso.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/dvb/dvb-usb/af9005-fe.c')
-rw-r--r-- | drivers/media/dvb/dvb-usb/af9005-fe.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/media/dvb/dvb-usb/af9005-fe.c b/drivers/media/dvb/dvb-usb/af9005-fe.c index 6809c6024d46..b1a9c4cdec93 100644 --- a/drivers/media/dvb/dvb-usb/af9005-fe.c +++ b/drivers/media/dvb/dvb-usb/af9005-fe.c | |||
@@ -343,8 +343,8 @@ static int af9005_reset_pre_viterbi(struct dvb_frontend *fe) | |||
343 | 1 & 0xff); | 343 | 1 & 0xff); |
344 | if (ret) | 344 | if (ret) |
345 | return ret; | 345 | return ret; |
346 | af9005_write_ofdm_register(state->d, xd_p_fec_super_frm_unit_15_8, | 346 | ret = af9005_write_ofdm_register(state->d, xd_p_fec_super_frm_unit_15_8, |
347 | 1 >> 8); | 347 | 1 >> 8); |
348 | if (ret) | 348 | if (ret) |
349 | return ret; | 349 | return ret; |
350 | /* reset pre viterbi error count */ | 350 | /* reset pre viterbi error count */ |
@@ -879,10 +879,8 @@ static int af9005_fe_init(struct dvb_frontend *fe) | |||
879 | af9005_write_register_bits(state->d, xd_I2C_reg_ofdm_rst, | 879 | af9005_write_register_bits(state->d, xd_I2C_reg_ofdm_rst, |
880 | reg_ofdm_rst_pos, reg_ofdm_rst_len, 1))) | 880 | reg_ofdm_rst_pos, reg_ofdm_rst_len, 1))) |
881 | return ret; | 881 | return ret; |
882 | if ((ret = | 882 | ret = af9005_write_register_bits(state->d, xd_I2C_reg_ofdm_rst, |
883 | af9005_write_register_bits(state->d, xd_I2C_reg_ofdm_rst, | 883 | reg_ofdm_rst_pos, reg_ofdm_rst_len, 0); |
884 | reg_ofdm_rst_pos, reg_ofdm_rst_len, 0))) | ||
885 | return ret; | ||
886 | 884 | ||
887 | if (ret) | 885 | if (ret) |
888 | return ret; | 886 | return ret; |