Skip to content

Commit

Permalink
usb: imx21-hcd.c: Use clk_prepare_enable/clk_disable_unprepare
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Fabio Estevam authored and Felipe Balbi committed Jun 12, 2012
1 parent 8194fea commit 2b97fb5
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions drivers/usb/host/imx21-hcd.c
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand Down Expand Up @@ -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;

Expand All @@ -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);
Expand Down

0 comments on commit 2b97fb5

Please sign in to comment.