]>
Commit | Line | Data |
---|---|---|
95244f99 GKH |
1 | From foo@baz Wed Dec 6 17:39:55 CET 2017 |
2 | From: M'boumba Cedric Madianga <cedric.madianga@gmail.com> | |
3 | Date: Tue, 13 Dec 2016 14:40:43 +0100 | |
4 | Subject: dmaengine: stm32-dma: Set correct args number for DMA request from DT | |
5 | ||
6 | From: M'boumba Cedric Madianga <cedric.madianga@gmail.com> | |
7 | ||
8 | ||
9 | [ Upstream commit 7e96304d99477de1f70db42035071e56439da817 ] | |
10 | ||
11 | This patch sets the right number of arguments to be used for DMA clients | |
12 | which request channels from DT. | |
13 | ||
14 | Signed-off-by: M'boumba Cedric Madianga <cedric.madianga@gmail.com> | |
15 | Reviewed-by: Ludovic BARRE <ludovic.barre@st.com> | |
16 | Signed-off-by: Vinod Koul <vinod.koul@intel.com> | |
17 | Signed-off-by: Sasha Levin <alexander.levin@verizon.com> | |
18 | Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> | |
19 | --- | |
20 | drivers/dma/stm32-dma.c | 7 ++----- | |
21 | 1 file changed, 2 insertions(+), 5 deletions(-) | |
22 | ||
23 | --- a/drivers/dma/stm32-dma.c | |
24 | +++ b/drivers/dma/stm32-dma.c | |
25 | @@ -976,21 +976,18 @@ static struct dma_chan *stm32_dma_of_xla | |
26 | struct stm32_dma_chan *chan; | |
27 | struct dma_chan *c; | |
28 | ||
29 | - if (dma_spec->args_count < 3) | |
30 | + if (dma_spec->args_count < 4) | |
31 | return NULL; | |
32 | ||
33 | cfg.channel_id = dma_spec->args[0]; | |
34 | cfg.request_line = dma_spec->args[1]; | |
35 | cfg.stream_config = dma_spec->args[2]; | |
36 | - cfg.threshold = 0; | |
37 | + cfg.threshold = dma_spec->args[3]; | |
38 | ||
39 | if ((cfg.channel_id >= STM32_DMA_MAX_CHANNELS) || (cfg.request_line >= | |
40 | STM32_DMA_MAX_REQUEST_ID)) | |
41 | return NULL; | |
42 | ||
43 | - if (dma_spec->args_count > 3) | |
44 | - cfg.threshold = dma_spec->args[3]; | |
45 | - | |
46 | chan = &dmadev->chan[cfg.channel_id]; | |
47 | ||
48 | c = dma_get_slave_channel(&chan->vchan.chan); |