diff options
| author | Robert Marklund <robert.marklund@stericsson.com> | 2011-06-27 11:33:24 +0200 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@intel.com> | 2011-07-14 04:09:10 +0530 |
| commit | 79ca7ec3d1046a79c64f95f0cac0f5fd29829f53 (patch) | |
| tree | 4f2bb252f04c36040dc60679cdad8fc5e5d8b846 /drivers/dma | |
| parent | ae752bf4cb78520e42f96f904e441c50f2114c7b (diff) | |
| download | linux-3.10-79ca7ec3d1046a79c64f95f0cac0f5fd29829f53.tar.gz linux-3.10-79ca7ec3d1046a79c64f95f0cac0f5fd29829f53.tar.bz2 linux-3.10-79ca7ec3d1046a79c64f95f0cac0f5fd29829f53.zip | |
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 e1af76c57e4..35b078d688d 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, struct scatterlist *sg; int i; - sg = kcalloc(periods + 1, sizeof(struct scatterlist), GFP_KERNEL); + sg = kcalloc(periods + 1, sizeof(struct scatterlist), GFP_NOWAIT); for (i = 0; i < periods; i++) { sg_dma_address(&sg[i]) = dma_addr; sg_dma_len(&sg[i]) = period_len; |