diff options
| author | Robert Marklund <robert.marklund@stericsson.com> | 2011-05-25 17:34:21 +0200 |
|---|---|---|
| committer | Ulf Hansson <ulf.hansson@stericsson.com> | 2011-09-19 15:15:20 +0200 |
| commit | 2e7c6d61ec68b8ed277dc9bb76c96773d7b51591 (patch) | |
| tree | f43de12323ef699e6a5c04a8be13ee5ff111788c /drivers/dma/ste_dma40.c | |
| parent | 1a7d26303c5a446847f1add8674f10a9fe527a16 (diff) | |
dma: Make the cycic alloc NOWAIT
ST-Ericsson Linux next: OK
ST-Ericsson ID: 342253
ST-Ericsson FOSS-OUT ID: Trivial
Signed-off-by: Robert Marklund <robert.marklund@stericsson.com>
Change-Id: I7e792ed1d9d9c04d3af598caf30f1c26744c1183
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/24723
Reviewed-by: Rabin VINCENT <rabin.vincent@stericsson.com>
Reviewed-by: Philippe LANGLAIS <philippe.langlais@stericsson.com>
Diffstat (limited to 'drivers/dma/ste_dma40.c')
| -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 8f222d4db7d..beadb86eeca 100644 --- a/drivers/dma/ste_dma40.c +++ b/drivers/dma/ste_dma40.c @@ -2091,7 +2091,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; |