On Fri, May 25, 2012 at 08:14:54PM -0300, Fabio Estevam wrote:
> From: Fabio Estevam <fabio.estevam@xxxxxxxxxxxxx>
>
> Prepare the clock before enabling it.
>
> Cc: Felipe Balbi <balbi@xxxxxx>
> Cc: <linux-usb@xxxxxxxxxxxxxxx>
> Signed-off-by: Fabio Estevam <fabio.estevam@xxxxxxxxxxxxx>
Acked-by: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>
> ---
> drivers/usb/gadget/imx_udc.c | 6 +++---
> 1 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/usb/gadget/imx_udc.c b/drivers/usb/gadget/imx_udc.c
> index 54034f8..dc53348 100644
> --- a/drivers/usb/gadget/imx_udc.c
> +++ b/drivers/usb/gadget/imx_udc.c
> @@ -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));
> --
> 1.7.1
>
>
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
