From: Richard Zhao <richard.zhao@linaro.org>
Date: Fri, 13 Jan 2012 03:09:58 +0000 (+0800)
Subject: dma/imx-sdma: call sdma_set_channel_priority after sdma_request_channel
X-Git-Tag: MMI-PSA29.97-13-9~17121^2~50
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=3bb5e7caf9641b6a532a55cf3a3621ef814f57ee;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

dma/imx-sdma: call sdma_set_channel_priority after sdma_request_channel

sdma_request_channel sets the default priority. sdma_alloc_chan_resources
should call sdma_set_channel_priority thereafter to over write it.

Signed-off-by: Richard Zhao <richard.zhao@linaro.org>
Acked-by: Shawn Guo <shawn.guo@linaro.org>
Signed-off-by: Vinod Koul <vinod.koul@linux.intel.com>
---

diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c
index fd9ce77655bb..17a9d46bba15 100644
--- a/drivers/dma/imx-sdma.c
+++ b/drivers/dma/imx-sdma.c
@@ -873,11 +873,11 @@ static int sdma_alloc_chan_resources(struct dma_chan *chan)
 
 	sdmac->peripheral_type = data->peripheral_type;
 	sdmac->event_id0 = data->dma_request;
-	ret = sdma_set_channel_priority(sdmac, prio);
+	ret = sdma_request_channel(sdmac);
 	if (ret)
 		return ret;
 
-	ret = sdma_request_channel(sdmac);
+	ret = sdma_set_channel_priority(sdmac, prio);
 	if (ret)
 		return ret;