diff options
| author | Mika Westerberg <mika.westerberg@linux.intel.com> | 2013-06-18 17:29:44 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-06-18 19:11:04 +0100 |
| commit | 5548f98c46538d1da04eff179a52e50537d11465 (patch) | |
| tree | f142b3a58326013fc43db8be35fe8043636181b2 /drivers/spi | |
| parent | 7d132055814ef17a6c7b69f342244c410a5e000f (diff) | |
| download | linux-stable-5548f98c46538d1da04eff179a52e50537d11465.tar.gz linux-stable-5548f98c46538d1da04eff179a52e50537d11465.tar.bz2 linux-stable-5548f98c46538d1da04eff179a52e50537d11465.zip | |
spi/pxa2xx: use GFP_ATOMIC in sg table allocation
pxa2xx_spi_map_dma_buffer() gets called in tasklet context so we can't
sleep when we allocate a new sg table. Use GFP_ATOMIC here instead.
Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
Cc: stable@vger.kernel.org
Diffstat (limited to 'drivers/spi')
| -rw-r--r-- | drivers/spi/spi-pxa2xx-dma.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/spi/spi-pxa2xx-dma.c b/drivers/spi/spi-pxa2xx-dma.c index c735c5a008a2..6427600b5bbe 100644 --- 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; } |