]> err.no Git - linux-2.6/commitdiff
V4L/DVB (5933): Dvb-usb/af9005-fe.c: error check fixes
authorAdrian Bunk <bunk@stusta.de>
Fri, 27 Jul 2007 14:09:57 +0000 (11:09 -0300)
committerMauro Carvalho Chehab <mchehab@infradead.org>
Mon, 30 Jul 2007 19:26:37 +0000 (16:26 -0300)
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>
drivers/media/dvb/dvb-usb/af9005-fe.c

index 6809c6024d465e905ae70b4a99bc18bbebb0617a..b1a9c4cdec93ee27f8eec60f6f7dcf5774836c4e 100644 (file)
@@ -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;