diff options
author | Richard Zhao <richard.zhao@linaro.org> | 2012-01-12 22:09:58 -0500 |
---|---|---|
committer | Vinod Koul <vinod.koul@linux.intel.com> | 2012-01-30 22:33:16 -0500 |
commit | 3bb5e7caf9641b6a532a55cf3a3621ef814f57ee (patch) | |
tree | ab9738fc92b7ea230252f08c331e1255cb132b32 /drivers/dma/imx-sdma.c | |
parent | c4b56857d17540e8085a04ea479b0239f4ee764c (diff) |
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>
Diffstat (limited to 'drivers/dma/imx-sdma.c')
-rw-r--r-- | drivers/dma/imx-sdma.c | 4 |
1 files changed, 2 insertions, 2 deletions
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) | |||
873 | 873 | ||
874 | sdmac->peripheral_type = data->peripheral_type; | 874 | sdmac->peripheral_type = data->peripheral_type; |
875 | sdmac->event_id0 = data->dma_request; | 875 | sdmac->event_id0 = data->dma_request; |
876 | ret = sdma_set_channel_priority(sdmac, prio); | 876 | ret = sdma_request_channel(sdmac); |
877 | if (ret) | 877 | if (ret) |
878 | return ret; | 878 | return ret; |
879 | 879 | ||
880 | ret = sdma_request_channel(sdmac); | 880 | ret = sdma_set_channel_priority(sdmac, prio); |
881 | if (ret) | 881 | if (ret) |
882 | return ret; | 882 | return ret; |
883 | 883 | ||