diff options
| author | Krzysztof Kozlowski <k.kozlowski@samsung.com> | 2014-02-21 13:12:38 +0100 |
|---|---|---|
| committer | Chanho Park <chanho61.park@samsung.com> | 2014-11-18 12:00:19 +0900 |
| commit | 7ce22b4e804ba8421af0ad39875da3f56f2aaff6 (patch) | |
| tree | 8e8928b7824f1db9cbad5c1c25c6489f98994081 | |
| parent | 717d3cede21c0175c6ecf820ad21d74ed7070738 (diff) | |
| download | linux-3.10-7ce22b4e804ba8421af0ad39875da3f56f2aaff6.tar.gz linux-3.10-7ce22b4e804ba8421af0ad39875da3f56f2aaff6.tar.bz2 linux-3.10-7ce22b4e804ba8421af0ad39875da3f56f2aaff6.zip | |
regulator: max14577: Fix invalid return value on DT parse success
This fixes bug introduced in 667a6b7a (regulator: max14577: Add missing
of_node_put). The DTS parsing function returned number of matched
regulators as success status which then was compared against 0 in probe.
Result was a probe fail after successful parsing the DTS:
max14577-regulator: probe of max14577-regulator failed with error 2
Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Reviwed-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Mark Brown <broonie@linaro.org>
| -rw-r--r-- | drivers/regulator/max14577.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/regulator/max14577.c b/drivers/regulator/max14577.c index 6d651a6ccb5..3762649afb0 100644 --- a/drivers/regulator/max14577.c +++ b/drivers/regulator/max14577.c @@ -160,9 +160,10 @@ static int max14577_regulator_dt_parse_pdata(struct platform_device *pdev) ret = of_regulator_match(&pdev->dev, np, max14577_regulator_matches, MAX14577_REG_NUM); - 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); |