Commit 42a71ef9 authored Aug 21, 2014 by Julia Lawall Committed by Lee Jones Sep 26, 2014

mfd: menelaus: Fix error return code

Convert a zero return value on error to a negative one, as returned
elsewhere in the function.

Additionally, converted 1 << 7 to BIT(7) at the suggestion of Lee Jones.

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>
Signed-off-by: Lee Jones <lee.jones@linaro.org>

parent 2a3377ee

drivers/mfd/menelaus.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -1183,7 +1183,7 @@ static int menelaus_probe(struct i2c_client *client,
		const struct i2c_device_id *id)
		{
		struct menelaus_chip *menelaus;
		int rev = 0, val;
		int rev = 0;
		int err = 0;
		struct menelaus_platform_data *menelaus_pdata =
		dev_get_platdata(&client->dev);
		@@ -1236,10 +1236,10 @@ static int menelaus_probe(struct i2c_client *client,

		pr_info("Menelaus rev %d.%d\n", rev >> 4, rev & 0x0f);

		val = menelaus_read_reg(MENELAUS_VCORE_CTRL1);
		if (val < 0)
		err = menelaus_read_reg(MENELAUS_VCORE_CTRL1);
		if (err < 0)
		goto fail;
		if (val & (1 << 7))
		if (err & BIT(7))
		menelaus->vcore_hw_mode = 1;
		else
		menelaus->vcore_hw_mode = 0;

Admin message