From fa7db11dddd011905d34e87ec2dd55125eabbcf2 Mon Sep 17 00:00:00 2001 From: Vikas Sajjan Date: Tue, 23 Apr 2013 17:19:50 +0530 Subject: [PATCH] --- yaml --- r: 371613 b: refs/heads/master c: 11963a638f7ac30f926f4358f7f699828408bb96 h: refs/heads/master i: 371611: 971dfbbaa8efc8550fcf47b4313bd7bfc4cc5180 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/exynos/exynos_drm_fimd.c | 13 +++++-------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index b23f5166e7f1..e15b733b8788 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: baa88c8313bfdb5086220cbd962a93617ee85a91 +refs/heads/master: 11963a638f7ac30f926f4358f7f699828408bb96 diff --git a/trunk/drivers/gpu/drm/exynos/exynos_drm_fimd.c b/trunk/drivers/gpu/drm/exynos/exynos_drm_fimd.c index 4073430e22c3..746b282b343a 100644 --- a/trunk/drivers/gpu/drm/exynos/exynos_drm_fimd.c +++ b/trunk/drivers/gpu/drm/exynos/exynos_drm_fimd.c @@ -801,18 +801,18 @@ static int fimd_clock(struct fimd_context *ctx, bool enable) if (enable) { int ret; - ret = clk_enable(ctx->bus_clk); + ret = clk_prepare_enable(ctx->bus_clk); if (ret < 0) return ret; - ret = clk_enable(ctx->lcd_clk); + ret = clk_prepare_enable(ctx->lcd_clk); if (ret < 0) { - clk_disable(ctx->bus_clk); + clk_disable_unprepare(ctx->bus_clk); return ret; } } else { - clk_disable(ctx->lcd_clk); - clk_disable(ctx->bus_clk); + clk_disable_unprepare(ctx->lcd_clk); + clk_disable_unprepare(ctx->bus_clk); } return 0; @@ -996,9 +996,6 @@ static int fimd_remove(struct platform_device *pdev) if (ctx->suspended) goto out; - clk_disable(ctx->lcd_clk); - clk_disable(ctx->bus_clk); - pm_runtime_set_suspended(dev); pm_runtime_put_sync(dev);