On Fri, May 25, 2012 at 08:14:53PM -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/fsl_mxc_udc.c | 12 ++++++------
> 1 files changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/usb/gadget/fsl_mxc_udc.c b/drivers/usb/gadget/fsl_mxc_udc.c
> index dcbc0a2..f4b5109 100644
> --- a/drivers/usb/gadget/fsl_mxc_udc.c
> +++ b/drivers/usb/gadget/fsl_mxc_udc.c
> @@ -40,7 +40,7 @@ int fsl_udc_clk_init(struct platform_device *pdev)
> if (IS_ERR(mxc_ahb_clk))
> return PTR_ERR(mxc_ahb_clk);
>
> - ret = clk_enable(mxc_ahb_clk);
> + ret = clk_prepare_enable(mxc_ahb_clk);
> if (ret < 0) {
> dev_err(&pdev->dev, "clk_enable(\"usb_ahb\") failed\n");
> goto eenahb;
> @@ -65,7 +65,7 @@ int fsl_udc_clk_init(struct platform_device *pdev)
> }
> }
>
> - ret = clk_enable(mxc_usb_clk);
> + ret = clk_prepare_enable(mxc_usb_clk);
> if (ret < 0) {
> dev_err(&pdev->dev, "clk_enable(\"usb_clk\") failed\n");
> goto eenusb;
> @@ -79,7 +79,7 @@ eclkrate:
> mxc_usb_clk = NULL;
> egusb:
> if (!cpu_is_mx35())
> - clk_disable(mxc_ahb_clk);
> + clk_disable_unprepare(mxc_ahb_clk);
> eenahb:
> if (!cpu_is_mx35())
> clk_put(mxc_ahb_clk);
> @@ -104,7 +104,7 @@ void fsl_udc_clk_finalize(struct platform_device *pdev)
>
> /* ULPI transceivers don't need usbpll */
> if (pdata->phy_mode == FSL_USB2_PHY_ULPI) {
> - clk_disable(mxc_usb_clk);
> + clk_disable_unprepare(mxc_usb_clk);
> clk_put(mxc_usb_clk);
> mxc_usb_clk = NULL;
> }
> @@ -113,11 +113,11 @@ void fsl_udc_clk_finalize(struct platform_device *pdev)
> void fsl_udc_clk_release(void)
> {
> if (mxc_usb_clk) {
> - clk_disable(mxc_usb_clk);
> + clk_disable_unprepare(mxc_usb_clk);
> clk_put(mxc_usb_clk);
> }
> if (!cpu_is_mx35()) {
> - clk_disable(mxc_ahb_clk);
> + clk_disable_unprepare(mxc_ahb_clk);
> clk_put(mxc_ahb_clk);
> }
> }
> --
> 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
