diff options
author | Robert Marklund <robert.marklund@stericsson.com> | 2011-06-27 05:33:24 -0400 |
---|---|---|
committer | Vinod Koul <vinod.koul@intel.com> | 2011-07-13 18:39:10 -0400 |
commit | 79ca7ec3d1046a79c64f95f0cac0f5fd29829f53 (patch) | |
tree | 4f2bb252f04c36040dc60679cdad8fc5e5d8b846 /drivers/dma | |
parent | ae752bf4cb78520e42f96f904e441c50f2114c7b (diff) |
dmaengine/ste_dma40: make the cyclic alloc NOWAIT
This function may be initiated from IRQ context, so the allocation
must allocate NOWAIT memory.
Signed-off-by: Robert Marklund <robert.marklund@stericsson.com>
Reviewed-by: Rabin Vincent <rabin.vincent@stericsson.com>
Reviewed-by: Philippe Langlais <philippe.langlais@stericsson.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Diffstat (limited to 'drivers/dma')
-rw-r--r-- | drivers/dma/ste_dma40.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/dma/ste_dma40.c b/drivers/dma/ste_dma40.c index e1af76c57e4f..35b078d688d5 100644 --- a/drivers/dma/ste_dma40.c +++ b/drivers/dma/ste_dma40.c | |||
@@ -2112,7 +2112,7 @@ dma40_prep_dma_cyclic(struct dma_chan *chan, dma_addr_t dma_addr, | |||
2112 | struct scatterlist *sg; | 2112 | struct scatterlist *sg; |
2113 | int i; | 2113 | int i; |
2114 | 2114 | ||
2115 | sg = kcalloc(periods + 1, sizeof(struct scatterlist), GFP_KERNEL); | 2115 | sg = kcalloc(periods + 1, sizeof(struct scatterlist), GFP_NOWAIT); |
2116 | for (i = 0; i < periods; i++) { | 2116 | for (i = 0; i < periods; i++) { |
2117 | sg_dma_address(&sg[i]) = dma_addr; | 2117 | sg_dma_address(&sg[i]) = dma_addr; |
2118 | sg_dma_len(&sg[i]) = period_len; | 2118 | sg_dma_len(&sg[i]) = period_len; |