From 249c42c4780cd3133799793df161a91773215168 Mon Sep 17 00:00:00 2001 From: Sachin Kamat Date: Mon, 24 Dec 2012 14:03:48 +0530 Subject: [PATCH] --- yaml --- r: 348435 b: refs/heads/master c: af8cd946136a1c1e9614ac9f9fc78e58654582ac h: refs/heads/master i: 348433: 36c0a27b77c7adb21d32dd041a4ccf46ae165020 348431: 077694c63749a14f70f10236bf841bebe943eef6 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/exynos/exynos_drm_rotator.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index f87903f4a506..e3928bc03603 100644 --- 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 index 77bd6fd84e1c..cc553a66cfa7 100644 --- 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);