aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDiego Liziero <diegoliz@gmail.com>2009-04-14 03:04:47 +0200
committerLiam Girdwood <lrg@slimlogic.co.uk>2009-04-28 18:58:07 +0100
commitcd78dfc6c6e321a310a73ef7b0df3d262704dd55 (patch)
tree9b54c41207160b04946a7984dfc863167afc1b1b
parent036de8efae4b81f8e1504fab654070cecce6dfa9 (diff)
drivers/regulator: fix when type is different from REGULATOR_VOLTAGE or REGULATOR_CURRENT
When regulator_desc->type is something different from REGULATOR_VOLTAGE or REGULATOR_CURRENT the if should probably return ERR_PTR(-EINVAL) The semantic patch that makes this change is as follows: (http://www.emn.fr/x-info/coccinelle/) @@ expression E; constant C; @@ ( - !E == C + E != C ) Signed-off-by: Diego Liziero <diegoliz@gmail.com> Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
-rw-r--r--drivers/regulator/core.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
index 47fc6e6..cb62be6 100644
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -2001,8 +2001,8 @@ struct regulator_dev *regulator_register(struct regulator_desc *regulator_desc,
if (regulator_desc->name == NULL || regulator_desc->ops == NULL)
return ERR_PTR(-EINVAL);
- if (!regulator_desc->type == REGULATOR_VOLTAGE &&
- !regulator_desc->type == REGULATOR_CURRENT)
+ if (regulator_desc->type != REGULATOR_VOLTAGE &&
+ regulator_desc->type != REGULATOR_CURRENT)
return ERR_PTR(-EINVAL);
if (!init_data)