Re: [PATCH] drivers/regulator: use PTR_ERR to get error code

Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx> · Sat, 21 Nov 2009 21:33:25 +0000

On 21 Nov 2009, at 21:18, Julia Lawall <julia@xxxxxxx> wrote:

From: Julia Lawall <julia@xxxxxxx>

IS_ERR returns only 1 or 0.  The callsite of setup_regulators  
expects a
negative integer in an error case.  Thus, PTR_ERR has to be used to  
extract
it.

The semantic match that finds this problem is as follows:
(http://coccinelle.lip6.fr/)

// <smpl>
@@
expression E,E1;
@@

*E = IS_ERR(...)
... when != E = E1
*return E;
// </smpl>

Signed-off-by: Julia Lawall <julia@xxxxxxx>

Acked-by: <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>


---
drivers/regulator/lp3971.c          |    4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/regulator/lp3971.c b/drivers/regulator/lp3971.c
index 7803a32..76d08c2 100644
--- a/drivers/regulator/lp3971.c
+++ b/drivers/regulator/lp3971.c
@@ -446,8 +446,8 @@ static int setup_regulators(struct lp3971 *lp3971,
       lp3971->rdev[i] = regulator_register(&regulators[id],
           lp3971->dev, pdata->regulators[i].initdata, lp3971);

-        err = IS_ERR(lp3971->rdev[i]);
-        if (err) {
+        if (IS_ERR(lp3971->rdev[i])) {
+            err = PTR_ERR(lp3971->rdev[i]);
           dev_err(lp3971->dev, "regulator init failed: %d\n",
               err);
           goto error;
--
To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html




