From ebe30be3aae977c7c5fb43fd27f2810c055f2123 Mon Sep 17 00:00:00 2001
From: Sachin Kamat <sachin.kamat@linaro.org>
Date: Fri, 10 Aug 2012 07:53:45 -0300
Subject: [PATCH] --- yaml --- r: 330887 b: refs/heads/master c:
 00d98c1bd6fe93de6db6a99ed25b4b7d96a402ec h: refs/heads/master i:   330885:
 d8a32551660a029a061ea7389e977f452c721d44   330883:
 49661a870c928f0d0fa918a1ead22428d34717ec   330879:
 82039017d11536bc2675307f46a71aad84308d04 v: v3

---
 [refs]                                        |  2 +-
 trunk/drivers/media/platform/s5p-tv/sdo_drv.c | 10 +++-------
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index d374541cc404..24c7e98705f7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d1bb4b29a74ea81b8282011479bc36417620b5fa
+refs/heads/master: 00d98c1bd6fe93de6db6a99ed25b4b7d96a402ec
diff --git a/trunk/drivers/media/platform/s5p-tv/sdo_drv.c b/trunk/drivers/media/platform/s5p-tv/sdo_drv.c
index f6bca2c20e89..ad68bbed014e 100644
--- a/trunk/drivers/media/platform/s5p-tv/sdo_drv.c
+++ b/trunk/drivers/media/platform/s5p-tv/sdo_drv.c
@@ -374,15 +374,15 @@ static int __devinit sdo_probe(struct platform_device *pdev)
 	dev_info(dev, "fout_vpll.rate = %lu\n", clk_get_rate(sclk_vpll));
 
 	/* acquire regulator */
-	sdev->vdac = regulator_get(dev, "vdd33a_dac");
+	sdev->vdac = devm_regulator_get(dev, "vdd33a_dac");
 	if (IS_ERR_OR_NULL(sdev->vdac)) {
 		dev_err(dev, "failed to get regulator 'vdac'\n");
 		goto fail_fout_vpll;
 	}
-	sdev->vdet = regulator_get(dev, "vdet");
+	sdev->vdet = devm_regulator_get(dev, "vdet");
 	if (IS_ERR_OR_NULL(sdev->vdet)) {
 		dev_err(dev, "failed to get regulator 'vdet'\n");
-		goto fail_vdac;
+		goto fail_fout_vpll;
 	}
 
 	/* enable gate for dac clock, because mixer uses it */
@@ -406,8 +406,6 @@ static int __devinit sdo_probe(struct platform_device *pdev)
 	dev_info(dev, "probe succeeded\n");
 	return 0;
 
-fail_vdac:
-	regulator_put(sdev->vdac);
 fail_fout_vpll:
 	clk_put(sdev->fout_vpll);
 fail_dacphy:
@@ -428,8 +426,6 @@ static int __devexit sdo_remove(struct platform_device *pdev)
 
 	pm_runtime_disable(&pdev->dev);
 	clk_disable(sdev->dac);
-	regulator_put(sdev->vdet);
-	regulator_put(sdev->vdac);
 	clk_put(sdev->fout_vpll);
 	clk_put(sdev->dacphy);
 	clk_put(sdev->dac);