projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branches 'fixes' and 'misc' into for-next
[linux-2.6-block.git]
/
drivers
/
regulator
/
max14577.c
diff --git
a/drivers/regulator/max14577.c
b/drivers/regulator/max14577.c
index 186df8785a912483ee84050160649eb7911037c2..e0619526708c88393069abf4411fa2ff9473e510 100644
(file)
--- a/
drivers/regulator/max14577.c
+++ b/
drivers/regulator/max14577.c
@@
-166,9
+166,10
@@
static int max14577_regulator_dt_parse_pdata(struct platform_device *pdev)
ret = of_regulator_match(&pdev->dev, np, max14577_regulator_matches,
MAX14577_REG_MAX);
- if (ret < 0)
{
+ if (ret < 0)
dev_err(&pdev->dev, "Error parsing regulator init data: %d\n", ret);
- }
+ else
+ ret = 0;
of_node_put(np);