summaryrefslogtreecommitdiffstats
path: root/drivers/video/fbdev/pxa3xx-gcu.c
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2015-08-17 06:13:53 +0200
committerDave Airlie <airlied@redhat.com>2015-08-17 06:13:53 +0200
commit4eebf60b7452fbd551fd7dece855ba7825a49cbc (patch)
tree490b4d194ba09c90e10201ab7fc084a0bda0ed27 /drivers/video/fbdev/pxa3xx-gcu.c
parentMerge tag 'drm-amdkfd-next-fixes-2015-08-05' of git://people.freedesktop.org/... (diff)
parentLinux 4.2-rc7 (diff)
downloadlinux-4eebf60b7452fbd551fd7dece855ba7825a49cbc.tar.xz
linux-4eebf60b7452fbd551fd7dece855ba7825a49cbc.zip
Merge tag 'v4.2-rc7' into drm-next
Linux 4.2-rc7 Backmerge master for i915 fixes
Diffstat (limited to 'drivers/video/fbdev/pxa3xx-gcu.c')
-rw-r--r--drivers/video/fbdev/pxa3xx-gcu.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/fbdev/pxa3xx-gcu.c b/drivers/video/fbdev/pxa3xx-gcu.c
index 86bd457d039d..50bce45e7f3d 100644
--- a/drivers/video/fbdev/pxa3xx-gcu.c
+++ b/drivers/video/fbdev/pxa3xx-gcu.c
@@ -653,7 +653,7 @@ static int pxa3xx_gcu_probe(struct platform_device *pdev)
goto err_free_dma;
}
- ret = clk_enable(priv->clk);
+ ret = clk_prepare_enable(priv->clk);
if (ret < 0) {
dev_err(dev, "failed to enable clock\n");
goto err_misc_deregister;
@@ -685,7 +685,7 @@ err_misc_deregister:
misc_deregister(&priv->misc_dev);
err_disable_clk:
- clk_disable(priv->clk);
+ clk_disable_unprepare(priv->clk);
return ret;
}