---

yaml --- r: 348435 b: refs/heads/master c: af8cd94 h: refs/heads/master i: 348433: 36c0a27 348431: 077694c v: v3
git-mirror · Jan 4, 2013 · 249c42c · 249c42c
1 parent 8663e9d
commit 249c42c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: df257a8db416cdae87fe0e31287a3df86dd8ba5a
+refs/heads/master: af8cd946136a1c1e9614ac9f9fc78e58654582ac
diff --git a/trunk/drivers/gpu/drm/exynos/exynos_drm_rotator.c b/trunk/drivers/gpu/drm/exynos/exynos_drm_rotator.c
@@ -675,7 +675,7 @@ static int __devinit rotator_probe(struct platform_device *pdev)
 		return ret;
 	}
 
-	rot->clock = clk_get(dev, "rotator");
+	rot->clock = devm_clk_get(dev, "rotator");
 	if (IS_ERR_OR_NULL(rot->clock)) {
 		dev_err(dev, "failed to get clock\n");
 		ret = PTR_ERR(rot->clock);
@@ -713,7 +713,6 @@ static int __devinit rotator_probe(struct platform_device *pdev)
 err_ippdrv_register:
 	devm_kfree(dev, ippdrv->prop_list);
 	pm_runtime_disable(dev);
-	clk_put(rot->clock);
 err_clk_get:
 	free_irq(rot->irq, rot);
 	return ret;
@@ -729,7 +728,6 @@ static int __devexit rotator_remove(struct platform_device *pdev)
 	exynos_drm_ippdrv_unregister(ippdrv);
 
 	pm_runtime_disable(dev);
-	clk_put(rot->clock);
 
 	free_irq(rot->irq, rot);