Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c2c744d3 authored by Richard Zhao's avatar Richard Zhao Committed by Vinod Koul
Browse files

dma/imx-sdma: move clk_enable out of sdma_request_channel 



It makes clk_enable/disable pair more readable, and fix one bug:
sdma_init calls sdma_request_channel, but seems don't know
sdma_request_channel enabled the clock.

Signed-off-by: default avatarRichard Zhao <richard.zhao@linaro.org>
Acked-by: default avatarShawn Guo <shawn.guo@linaro.org>
[fixed typo in commit log]
Signed-off-by: default avatarVinod Koul <vinod.koul@linux.intel.com>
parent 3bb5e7ca

drivers/dma/imx-sdma.c

+3 −2
Original line number Diff line number Diff line
@@ -802,8 +802,6 @@ static int sdma_request_channel(struct sdma_channel *sdmac) 
	sdma->channel_control[channel].base_bd_ptr = sdmac->bd_phys;

	sdma->channel_control[channel].current_bd_ptr = sdmac->bd_phys;



	clk_enable(sdma->clk);



	sdma_set_channel_priority(sdmac, MXC_SDMA_DEFAULT_PRIORITY);



	init_completion(&sdmac->done);
@@ -873,6 +871,9 @@ static int sdma_alloc_chan_resources(struct dma_chan *chan) 


	sdmac->peripheral_type = data->peripheral_type;

	sdmac->event_id0 = data->dma_request;



	clk_enable(sdmac->sdma->clk);



	ret = sdma_request_channel(sdmac);

	if (ret)

		return ret;