From 164f62f81eb88801da296e231dbeb0f3d64f21f5 Mon Sep 17 00:00:00 2001 From: Thomas Abraham Date: Wed, 3 Oct 2012 08:41:37 +0900 Subject: [PATCH] --- yaml --- r: 338527 b: refs/heads/master c: c05c946c68e381074dde259d8ce243da1b1aae02 h: refs/heads/master i: 338525: ffca000ae3d0042c16d0fda5a8886b7dba4a9d17 338523: 6f6daaabe88ff8fdfc0b0c9e1bbb97aa5fdcdba7 338519: d6fc7157ffe6a30dd7862feb786918ac15c2b10a 338511: a85d032ef39c250bbd4fe80cfa0828d76d0b45d3 338495: b0d8ecd764831d78fa8cb6e059e7d5da6f902427 v: v3 --- [refs] | 2 +- trunk/drivers/usb/host/ohci-exynos.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index d9e03414c2f0..9e390cbf9420 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e1deb56cb775ab953bc5245feaf1f43269409139 +refs/heads/master: c05c946c68e381074dde259d8ce243da1b1aae02 diff --git a/trunk/drivers/usb/host/ohci-exynos.c b/trunk/drivers/usb/host/ohci-exynos.c index 929a49437e2e..9e3d2da7537a 100644 --- a/trunk/drivers/usb/host/ohci-exynos.c +++ b/trunk/drivers/usb/host/ohci-exynos.c @@ -123,7 +123,7 @@ static int __devinit exynos_ohci_probe(struct platform_device *pdev) goto fail_clk; } - err = clk_enable(exynos_ohci->clk); + err = clk_prepare_enable(exynos_ohci->clk); if (err) goto fail_clken; @@ -167,7 +167,7 @@ static int __devinit exynos_ohci_probe(struct platform_device *pdev) return 0; fail_io: - clk_disable(exynos_ohci->clk); + clk_disable_unprepare(exynos_ohci->clk); fail_clken: clk_put(exynos_ohci->clk); fail_clk: @@ -186,7 +186,7 @@ static int __devexit exynos_ohci_remove(struct platform_device *pdev) if (pdata && pdata->phy_exit) pdata->phy_exit(pdev, S5P_USB_PHY_HOST); - clk_disable(exynos_ohci->clk); + clk_disable_unprepare(exynos_ohci->clk); clk_put(exynos_ohci->clk); usb_put_hcd(hcd); @@ -232,7 +232,7 @@ static int exynos_ohci_suspend(struct device *dev) if (pdata && pdata->phy_exit) pdata->phy_exit(pdev, S5P_USB_PHY_HOST); - clk_disable(exynos_ohci->clk); + clk_disable_unprepare(exynos_ohci->clk); fail: spin_unlock_irqrestore(&ohci->lock, flags); @@ -247,7 +247,7 @@ static int exynos_ohci_resume(struct device *dev) struct platform_device *pdev = to_platform_device(dev); struct exynos4_ohci_platdata *pdata = pdev->dev.platform_data; - clk_enable(exynos_ohci->clk); + clk_prepare_enable(exynos_ohci->clk); if (pdata && pdata->phy_init) pdata->phy_init(pdev, S5P_USB_PHY_HOST);