summaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@stusta.de>2007-07-27 11:09:57 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2007-07-30 16:26:37 -0300
commit4bc4365291bc27798d760c87f3aada39d9a74f43 (patch)
tree9f089bd5595a583671b7dfbb1eb5d90df1d6dfd3 /drivers/media
parent639ffd2d9038d34725b752147a0f1a8536146851 (diff)
downloadkernel-crypto-4bc4365291bc27798d760c87f3aada39d9a74f43.tar.gz
kernel-crypto-4bc4365291bc27798d760c87f3aada39d9a74f43.tar.xz
kernel-crypto-4bc4365291bc27798d760c87f3aada39d9a74f43.zip
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')
-rw-r--r--drivers/media/dvb/dvb-usb/af9005-fe.c10
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 6809c6024d4..b1a9c4cdec9 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)
1 & 0xff);
if (ret)
return ret;
- af9005_write_ofdm_register(state->d, xd_p_fec_super_frm_unit_15_8,
- 1 >> 8);
+ ret = af9005_write_ofdm_register(state->d, xd_p_fec_super_frm_unit_15_8,
+ 1 >> 8);
if (ret)
return ret;
/* reset pre viterbi error count */
@@ -879,10 +879,8 @@ static int af9005_fe_init(struct dvb_frontend *fe)
af9005_write_register_bits(state->d, xd_I2C_reg_ofdm_rst,
reg_ofdm_rst_pos, reg_ofdm_rst_len, 1)))
return ret;
- if ((ret =
- af9005_write_register_bits(state->d, xd_I2C_reg_ofdm_rst,
- reg_ofdm_rst_pos, reg_ofdm_rst_len, 0)))
- return ret;
+ ret = af9005_write_register_bits(state->d, xd_I2C_reg_ofdm_rst,
+ reg_ofdm_rst_pos, reg_ofdm_rst_len, 0);
if (ret)
return ret;