diff options
| author | Mark Brown <broonie@sirena.org.uk> | 2013-04-28 02:13:48 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@sirena.org.uk> | 2013-04-28 02:13:48 +0100 |
| commit | 64dceea44604e1b1b84f666ac5bb54ca8d2be56b (patch) | |
| tree | 65ec92245b352145bd1f369c9f0f801ba28a11ef /drivers | |
| parent | 813dc1b086d230ad3fe8ccf7ef70a135d08c3b27 (diff) | |
| parent | 6673d66e5a772763f0e1b3b229474f261be37506 (diff) | |
Merge remote-tracking branch 'regulator/topic/tps6586x' into v3.9-rc8
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/regulator/tps6586x-regulator.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/regulator/tps6586x-regulator.c b/drivers/regulator/tps6586x-regulator.c index ac8a6cb6209..d8fa37d5c73 100644 --- a/drivers/regulator/tps6586x-regulator.c +++ b/drivers/regulator/tps6586x-regulator.c @@ -246,7 +246,7 @@ static int tps6586x_regulator_set_slew_rate(struct platform_device *pdev, reg = TPS6586X_SM1SL; break; default: - dev_warn(&pdev->dev, "Only SM0/SM1 can set slew rate\n"); + dev_err(&pdev->dev, "Only SM0/SM1 can set slew rate\n"); return -EINVAL; } @@ -305,14 +305,12 @@ static struct tps6586x_platform_data *tps6586x_parse_regulator_dt( } err = of_regulator_match(&pdev->dev, regs, tps6586x_matches, num); + of_node_put(regs); if (err < 0) { dev_err(&pdev->dev, "Regulator match failed, e %d\n", err); - of_node_put(regs); return NULL; } - of_node_put(regs); - pdata = devm_kzalloc(&pdev->dev, sizeof(*pdata), GFP_KERNEL); if (!pdata) { dev_err(&pdev->dev, "Memory alloction failed\n"); |