projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branch 'origin/upstream/linux-linaro-lsk-v3.10-android+android...
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
spi
/
spi-pxa2xx-dma.c
diff --git
a/drivers/spi/spi-pxa2xx-dma.c
b/drivers/spi/spi-pxa2xx-dma.c
index c735c5a008a2a180669cb1ece71fa8ccfb112cdf..6427600b5bbe66c5d66fbcf967a1b20a008162da 100644
(file)
--- a/
drivers/spi/spi-pxa2xx-dma.c
+++ b/
drivers/spi/spi-pxa2xx-dma.c
@@
-59,7
+59,7
@@
static int pxa2xx_spi_map_dma_buffer(struct driver_data *drv_data,
int ret;
sg_free_table(sgt);
- ret = sg_alloc_table(sgt, nents, GFP_
KERNEL
);
+ ret = sg_alloc_table(sgt, nents, GFP_
ATOMIC
);
if (ret)
return ret;
}