Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 58f087c9 authored by Julia Lawall's avatar Julia Lawall Committed by Mauro Carvalho Chehab
Browse files

[media] e4000: fix error return code 

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: default avatarJulia Lawall <Julia.Lawall@lip6.fr>
Cc: Antti Palosaari <crope@iki.fi>
Signed-off-by: default avatarMauro Carvalho Chehab <m.chehab@samsung.com>
parent 6c49d793

drivers/media/tuners/e4000.c

+12 −4
Original line number Original line Diff line number Diff line
@@ -243,8 +243,10 @@ static int e4000_set_params(struct dvb_frontend *fe) 
			break;

			break;

	}

	}





	if (i == ARRAY_SIZE(e4000_pll_lut))

	if (i == ARRAY_SIZE(e4000_pll_lut)) {

		ret = -EINVAL;

		goto err;

		goto err;

	}





	/*

	/*

	 * Note: Currently f_vco overflows when c->frequency is 1 073 741 824 Hz

	 * 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;

			break;

	}

	}





	if (i == ARRAY_SIZE(e400_lna_filter_lut))

	if (i == ARRAY_SIZE(e400_lna_filter_lut)) {

		ret = -EINVAL;

		goto err;

		goto err;

	}





	ret = e4000_wr_reg(priv, 0x10, e400_lna_filter_lut[i].val);

	ret = e4000_wr_reg(priv, 0x10, e400_lna_filter_lut[i].val);

	if (ret < 0)

	if (ret < 0)
@@ -284,8 +288,10 @@ static int e4000_set_params(struct dvb_frontend *fe) 
			break;

			break;

	}

	}





	if (i == ARRAY_SIZE(e4000_if_filter_lut))

	if (i == ARRAY_SIZE(e4000_if_filter_lut)) {

		ret = -EINVAL;

		goto err;

		goto err;

	}





	buf[0] = e4000_if_filter_lut[i].reg11_val;

	buf[0] = e4000_if_filter_lut[i].reg11_val;

	buf[1] = e4000_if_filter_lut[i].reg12_val;

	buf[1] = e4000_if_filter_lut[i].reg12_val;
@@ -300,8 +306,10 @@ static int e4000_set_params(struct dvb_frontend *fe) 
			break;

			break;

	}

	}





	if (i == ARRAY_SIZE(e4000_band_lut))

	if (i == ARRAY_SIZE(e4000_band_lut)) {

		ret = -EINVAL;

		goto err;

		goto err;

	}





	ret = e4000_wr_reg(priv, 0x07, e4000_band_lut[i].reg07_val);

	ret = e4000_wr_reg(priv, 0x07, e4000_band_lut[i].reg07_val);

	if (ret < 0)

	if (ret < 0)