iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'regulator/topic/tps6586x' into v3.9-rc8

Browse Source
This commit is contained in:
Mark Brown 2013-04-28 02:13:48 +01:00
commit 64dceea446
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/regulator/tps6586x-regulator.c
View File

@ -246,7 +246,7 @@ static int tps6586x_regulator_set_slew_rate(struct platform_device *pdev,
reg = TPS6586X_SM1SL; reg = TPS6586X_SM1SL;
break; break;
default: 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; 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); err = of_regulator_match(&pdev->dev, regs, tps6586x_matches, num);
of_node_put(regs);
if (err < 0) { if (err < 0) {
dev_err(&pdev->dev, "Regulator match failed, e %d\n", err); dev_err(&pdev->dev, "Regulator match failed, e %d\n", err);
of_node_put(regs);
return NULL; return NULL;
} }
of_node_put(regs);
pdata = devm_kzalloc(&pdev->dev, sizeof(*pdata), GFP_KERNEL); pdata = devm_kzalloc(&pdev->dev, sizeof(*pdata), GFP_KERNEL);
if (!pdata) { if (!pdata) {
dev_err(&pdev->dev, "Memory alloction failed\n"); dev_err(&pdev->dev, "Memory alloction failed\n");