On Fri, May 25, 2012 at 08:14:43PM -0300, Fabio Estevam wrote: > From: Fabio Estevam <fabio.estevam@xxxxxxxxxxxxx> > > Prepare the clock before enabling it. > > Cc: Jeff Garzik <jgarzik@xxxxxxxxx> > Cc: <linux-ide@xxxxxxxxxxxxxxx> > Signed-off-by: Fabio Estevam <fabio.estevam@xxxxxxxxxxxxx> Acked-by: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx> > --- > drivers/ata/pata_imx.c | 10 +++++----- > 1 files changed, 5 insertions(+), 5 deletions(-) > > diff --git a/drivers/ata/pata_imx.c b/drivers/ata/pata_imx.c > index c5af97f..87bb05b 100644 > --- a/drivers/ata/pata_imx.c > +++ b/drivers/ata/pata_imx.c > @@ -118,7 +118,7 @@ static int __devinit pata_imx_probe(struct platform_device *pdev) > return PTR_ERR(priv->clk); > } > > - clk_enable(priv->clk); > + clk_prepare_enable(priv->clk); > > host = ata_host_alloc(&pdev->dev, 1); > if (!host) > @@ -162,7 +162,7 @@ static int __devinit pata_imx_probe(struct platform_device *pdev) > &pata_imx_sht); > > free_priv: > - clk_disable(priv->clk); > + clk_disable_unprepare(priv->clk); > clk_put(priv->clk); > return -ENOMEM; > } > @@ -176,7 +176,7 @@ static int __devexit pata_imx_remove(struct platform_device *pdev) > > __raw_writel(0, priv->host_regs + PATA_IMX_ATA_INT_EN); > > - clk_disable(priv->clk); > + clk_disable_unprepare(priv->clk); > clk_put(priv->clk); > > return 0; > @@ -194,7 +194,7 @@ static int pata_imx_suspend(struct device *dev) > __raw_writel(0, priv->host_regs + PATA_IMX_ATA_INT_EN); > priv->ata_ctl = > __raw_readl(priv->host_regs + PATA_IMX_ATA_CONTROL); > - clk_disable(priv->clk); > + clk_disable_unprepare(priv->clk); > } > > return ret; > @@ -205,7 +205,7 @@ static int pata_imx_resume(struct device *dev) > struct ata_host *host = dev_get_drvdata(dev); > struct pata_imx_priv *priv = host->private_data; > > - clk_enable(priv->clk); > + clk_prepare_enable(priv->clk); > > __raw_writel(priv->ata_ctl, priv->host_regs + PATA_IMX_ATA_CONTROL); > > -- > 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-ide" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
