usb: imx_udc.c: Use clk_prepare_enable/clk_disable_unprepare
authorFabio Estevam <fabio.estevam@freescale.com>
Fri, 25 May 2012 23:14:54 +0000 (20:14 -0300)
committerFelipe Balbi <balbi@ti.com>
Tue, 12 Jun 2012 10:30:59 +0000 (13:30 +0300)
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>
drivers/usb/gadget/imx_udc.c

index 54034f84f9928e324bf756e8a6beddcf25c4087a..dc5334856afe7449745ff32c796c548eca772840 100644 (file)
@@ -1432,7 +1432,7 @@ static int __init imx_udc_probe(struct platform_device *pdev)
                dev_err(&pdev->dev, "can't get USB clock\n");
                goto fail2;
        }
-       clk_enable(clk);
+       clk_prepare_enable(clk);
 
        if (clk_get_rate(clk) != 48000000) {
                D_INI(&pdev->dev,
@@ -1496,7 +1496,7 @@ fail4:
                free_irq(imx_usb->usbd_int[i], imx_usb);
 fail3:
        clk_put(clk);
-       clk_disable(clk);
+       clk_disable_unprepare(clk);
 fail2:
        iounmap(base);
 fail1:
@@ -1521,7 +1521,7 @@ static int __exit imx_udc_remove(struct platform_device *pdev)
                free_irq(imx_usb->usbd_int[i], imx_usb);
 
        clk_put(imx_usb->clk);
-       clk_disable(imx_usb->clk);
+       clk_disable_unprepare(imx_usb->clk);
        iounmap(imx_usb->base);
 
        release_mem_region(imx_usb->res->start, resource_size(imx_usb->res));