diff options
| author | Fabio Estevam <fabio.estevam@freescale.com> | 2012-05-25 20:14:55 -0300 |
|---|---|---|
| committer | Felipe Balbi <balbi@ti.com> | 2012-06-12 13:31:03 +0300 |
| commit | 2b97fb5a605635684f757080cdc405d8173838d5 (patch) | |
| tree | f7f27ca7e0a919de38fd4f9786afd923882f11d2 /drivers | |
| parent | 8194fea0fc308a7cdfc9333584d69cb5d428d47f (diff) | |
| download | linux-3.10-2b97fb5a605635684f757080cdc405d8173838d5.tar.gz linux-3.10-2b97fb5a605635684f757080cdc405d8173838d5.tar.bz2 linux-3.10-2b97fb5a605635684f757080cdc405d8173838d5.zip | |
usb: imx21-hcd.c: Use clk_prepare_enable/clk_disable_unprepare
Prepare the clock before enabling it.
Cc: <linux-usb@vger.kernel.org>
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Acked-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/usb/host/imx21-hcd.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/usb/host/imx21-hcd.c b/drivers/usb/host/imx21-hcd.c index ff471c1c165..f19e2690c23 100644 --- a/drivers/usb/host/imx21-hcd.c +++ b/drivers/usb/host/imx21-hcd.c @@ -1811,7 +1811,7 @@ static int imx21_remove(struct platform_device *pdev) usb_remove_hcd(hcd); if (res != NULL) { - clk_disable(imx21->clk); + clk_disable_unprepare(imx21->clk); clk_put(imx21->clk); iounmap(imx21->regs); release_mem_region(res->start, resource_size(res)); @@ -1884,7 +1884,7 @@ static int imx21_probe(struct platform_device *pdev) ret = clk_set_rate(imx21->clk, clk_round_rate(imx21->clk, 48000000)); if (ret) goto failed_clock_set; - ret = clk_enable(imx21->clk); + ret = clk_prepare_enable(imx21->clk); if (ret) goto failed_clock_enable; @@ -1900,7 +1900,7 @@ static int imx21_probe(struct platform_device *pdev) return 0; failed_add_hcd: - clk_disable(imx21->clk); + clk_disable_unprepare(imx21->clk); failed_clock_enable: failed_clock_set: clk_put(imx21->clk); |