From b185d9b263a79f2301c7008cbcab9602776d58e7 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Tue, 21 May 2013 11:24:44 -0300 Subject: [PATCH] --- yaml --- r: 376050 b: refs/heads/master c: c7b0cf3e712775e8e2015c2f4582864159540be6 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/imx-drm/imx-tve.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 57c242d488e0..2db6087d43bc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8c24d6ea12879a4880c5f9a514dd4c3b6575094a +refs/heads/master: c7b0cf3e712775e8e2015c2f4582864159540be6 diff --git a/trunk/drivers/staging/imx-drm/imx-tve.c b/trunk/drivers/staging/imx-drm/imx-tve.c index ac1634464407..03892de9bd7e 100644 --- a/trunk/drivers/staging/imx-drm/imx-tve.c +++ b/trunk/drivers/staging/imx-drm/imx-tve.c @@ -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");