diff options
author | Krzysztof Kozlowski <k.kozlowski@samsung.com> | 2014-02-21 13:12:38 +0100 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2014-02-22 11:54:17 +0900 |
commit | 08221fc4e7aa585a59de90c0354da3e8d3e88d94 (patch) | |
tree | 6c0874180a2d4250f96da360cd0687da7ace409f /drivers/regulator | |
parent | 6d0abeca3242a88cab8232e4acd7e2bf088f3bc2 (diff) | |
download | op-kernel-dev-08221fc4e7aa585a59de90c0354da3e8d3e88d94.zip op-kernel-dev-08221fc4e7aa585a59de90c0354da3e8d3e88d94.tar.gz |
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>
Diffstat (limited to 'drivers/regulator')
-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 186df87..e061952 100644 --- 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); |