From e811aa1929594f435fc71bd0720cd864eddf35ac Mon Sep 17 00:00:00 2001 From: Robert Marklund Date: Mon, 27 Jun 2011 11:33:24 +0200 Subject: [PATCH] --- yaml --- r: 262039 b: refs/heads/master c: 79ca7ec3d1046a79c64f95f0cac0f5fd29829f53 h: refs/heads/master i: 262037: 10243bf34fd99c6ac99f4d09b7fd477ec435a2da 262035: 75ac661890e743fbae1886b895b2adf5094c3ec8 262031: 508f7cb46e6c7a1abcffc321ac07ac0673d13601 v: v3 --- [refs] | 2 +- trunk/drivers/dma/ste_dma40.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 83b08ac70b37..3ed63c4ee0d8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ae752bf4cb78520e42f96f904e441c50f2114c7b +refs/heads/master: 79ca7ec3d1046a79c64f95f0cac0f5fd29829f53 diff --git a/trunk/drivers/dma/ste_dma40.c b/trunk/drivers/dma/ste_dma40.c index e1af76c57e4f..35b078d688d5 100644 --- a/trunk/drivers/dma/ste_dma40.c +++ b/trunk/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;