From d6525abc6381ee651c3cbb864912019c35d0ed6d Mon Sep 17 00:00:00 2001 From: Vivek Gautam Date: Thu, 14 Mar 2013 16:14:58 +0530 Subject: [PATCH] --- yaml --- r: 364719 b: refs/heads/master c: ddb5147cea10308fac7d4ea44cbd164929199e03 h: refs/heads/master i: 364717: 2f05ce438c71af1420a128046e9bd3ebc7212814 364715: 530125beb0f8e7d1e61ef1fec72ed3428c07b9e5 364711: 4565663b24eb64250dc536391c4007578d5f09bf 364703: cd0b2b167131cc1e510463da234e759febf546de v: v3 --- [refs] | 2 +- trunk/drivers/usb/dwc3/dwc3-exynos.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 55b22d57a77b..4c965abf258f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: adcf20dcd2629112c467f30a2c057479979ae64c +refs/heads/master: ddb5147cea10308fac7d4ea44cbd164929199e03 diff --git a/trunk/drivers/usb/dwc3/dwc3-exynos.c b/trunk/drivers/usb/dwc3/dwc3-exynos.c index f77ec75e2d1e..1ea7bd8af6ae 100644 --- a/trunk/drivers/usb/dwc3/dwc3-exynos.c +++ b/trunk/drivers/usb/dwc3/dwc3-exynos.c @@ -138,7 +138,7 @@ static int dwc3_exynos_probe(struct platform_device *pdev) exynos->dev = dev; exynos->clk = clk; - clk_enable(exynos->clk); + clk_prepare_enable(exynos->clk); if (node) { ret = of_platform_populate(node, NULL, NULL, dev); @@ -155,7 +155,7 @@ static int dwc3_exynos_probe(struct platform_device *pdev) return 0; err2: - clk_disable(clk); + clk_disable_unprepare(clk); err1: return ret; } @@ -168,7 +168,7 @@ static int dwc3_exynos_remove(struct platform_device *pdev) platform_device_unregister(exynos->usb3_phy); device_for_each_child(&pdev->dev, NULL, dwc3_exynos_remove_child); - clk_disable(exynos->clk); + clk_disable_unprepare(exynos->clk); return 0; }