[media] e4000: fix error return code
authorJulia Lawall <Julia.Lawall@lip6.fr>
Sun, 29 Dec 2013 22:47:35 +0000 (19:47 -0300)
committerMauro Carvalho Chehab <m.chehab@samsung.com>
Tue, 7 Jan 2014 11:34:05 +0000 (09:34 -0200)
Set the return variable to an error code as done elsewhere in the function.

A simplified version of the semantic match that finds this problem is as
follows: (http://coccinelle.lip6.fr/)

// <smpl>
(
if@p1 (\(ret < 0\|ret != 0\))
 { ... return ret; }
|
ret@p1 = 0
)
... when != ret = e1
    when != &ret
*if(...)
{
  ... when != ret = e2
      when forall
 return ret;
}

// </smpl>

Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
Cc: Antti Palosaari <crope@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
drivers/media/tuners/e4000.c

index 72971a8d3c37978ef1c42b6a2523bb4cb8e92f4a..40c1da707d15ce86a094adcc25c7d4765f4ed00c 100644 (file)
@@ -243,8 +243,10 @@ static int e4000_set_params(struct dvb_frontend *fe)
                        break;
        }
 
-       if (i == ARRAY_SIZE(e4000_pll_lut))
+       if (i == ARRAY_SIZE(e4000_pll_lut)) {
+               ret = -EINVAL;
                goto err;
+       }
 
        /*
         * Note: Currently f_vco overflows when c->frequency is 1 073 741 824 Hz
@@ -271,8 +273,10 @@ static int e4000_set_params(struct dvb_frontend *fe)
                        break;
        }
 
-       if (i == ARRAY_SIZE(e400_lna_filter_lut))
+       if (i == ARRAY_SIZE(e400_lna_filter_lut)) {
+               ret = -EINVAL;
                goto err;
+       }
 
        ret = e4000_wr_reg(priv, 0x10, e400_lna_filter_lut[i].val);
        if (ret < 0)
@@ -284,8 +288,10 @@ static int e4000_set_params(struct dvb_frontend *fe)
                        break;
        }
 
-       if (i == ARRAY_SIZE(e4000_if_filter_lut))
+       if (i == ARRAY_SIZE(e4000_if_filter_lut)) {
+               ret = -EINVAL;
                goto err;
+       }
 
        buf[0] = e4000_if_filter_lut[i].reg11_val;
        buf[1] = e4000_if_filter_lut[i].reg12_val;
@@ -300,8 +306,10 @@ static int e4000_set_params(struct dvb_frontend *fe)
                        break;
        }
 
-       if (i == ARRAY_SIZE(e4000_band_lut))
+       if (i == ARRAY_SIZE(e4000_band_lut)) {
+               ret = -EINVAL;
                goto err;
+       }
 
        ret = e4000_wr_reg(priv, 0x07, e4000_band_lut[i].reg07_val);
        if (ret < 0)