From 487698c766f332c4fc889289056ad005307e28cc Mon Sep 17 00:00:00 2001 From: Shawn Guo Date: Tue, 20 Dec 2011 13:54:00 +0800 Subject: [PATCH] --- yaml --- r: 281947 b: refs/heads/master c: 759a2e30d288032130f1f77092e72d4ec87ad4d0 h: refs/heads/master i: 281945: 7e2274428d6c223a3062f3b69b481854f6283f0b 281943: 3e28265304f8293a53d8c37abe286a7d34df54ec v: v3 --- [refs] | 2 +- trunk/drivers/dma/mxs-dma.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index cc970879efeb..47b302fb01ea 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0ebafefcaa7a383b728d977a718e23e69ce84050 +refs/heads/master: 759a2e30d288032130f1f77092e72d4ec87ad4d0 diff --git a/trunk/drivers/dma/mxs-dma.c b/trunk/drivers/dma/mxs-dma.c index b4588bdd98bb..fc903c0ed234 100644 --- a/trunk/drivers/dma/mxs-dma.c +++ b/trunk/drivers/dma/mxs-dma.c @@ -334,7 +334,7 @@ static int mxs_dma_alloc_chan_resources(struct dma_chan *chan) goto err_irq; } - ret = clk_enable(mxs_dma->clk); + ret = clk_prepare_enable(mxs_dma->clk); if (ret) goto err_clk; @@ -372,7 +372,7 @@ static void mxs_dma_free_chan_resources(struct dma_chan *chan) dma_free_coherent(mxs_dma->dma_device.dev, PAGE_SIZE, mxs_chan->ccw, mxs_chan->ccw_phys); - clk_disable(mxs_dma->clk); + clk_disable_unprepare(mxs_dma->clk); } static struct dma_async_tx_descriptor *mxs_dma_prep_slave_sg( @@ -578,7 +578,7 @@ static int __init mxs_dma_init(struct mxs_dma_engine *mxs_dma) { int ret; - ret = clk_enable(mxs_dma->clk); + ret = clk_prepare_enable(mxs_dma->clk); if (ret) goto err_out; @@ -604,7 +604,7 @@ static int __init mxs_dma_init(struct mxs_dma_engine *mxs_dma) writel(MXS_DMA_CHANNELS_MASK << MXS_DMA_CHANNELS, mxs_dma->base + HW_APBHX_CTRL1 + MXS_SET_ADDR); - clk_disable(mxs_dma->clk); + clk_disable_unprepare(mxs_dma->clk); return 0;