Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 376050
b: refs/heads/master
c: c7b0cf3
h: refs/heads/master
v: v3
  • Loading branch information
Fabio Estevam authored and Greg Kroah-Hartman committed May 21, 2013
1 parent efb8e16 commit b185d9b
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 8c24d6ea12879a4880c5f9a514dd4c3b6575094a
refs/heads/master: c7b0cf3e712775e8e2015c2f4582864159540be6
4 changes: 3 additions & 1 deletion trunk/drivers/staging/imx-drm/imx-tve.c
Original file line number Diff line number Diff line change
Expand Up @@ -670,7 +670,9 @@ static int imx_tve_probe(struct platform_device *pdev)
tve->dac_reg = devm_regulator_get(&pdev->dev, "dac");
if (!IS_ERR(tve->dac_reg)) {
regulator_set_voltage(tve->dac_reg, 2750000, 2750000);
regulator_enable(tve->dac_reg);
ret = regulator_enable(tve->dac_reg);
if (ret)
return ret;
}

tve->clk = devm_clk_get(&pdev->dev, "tve");
Expand Down

0 comments on commit b185d9b

Please sign in to comment.